[automerger skipped] Merge "SoundPool: Improve single stream SoundPool handling" am: 0f8c08544a am: 4140a29ad5 am: d7ebcd20f9 -s ours
am skip reason: skip tag Change-Id Iec777d6319d5ed76000d4c5b12336b106dacede4 with SHA-1 fe4d13843a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640980
Change-Id: Id87baf0d718e4e6a79c4f48616b9c35516cc9978
This commit is contained in: