[automerger skipped] Merge "SoundPool: Improve single stream SoundPool handling" am: 0f8c0854 am: 4140a29a am: d7ebcd20 -s ours am: dac1d0a8 -s ours

am skip reason: skip tag Change-Id Iec777d6319d5ed76000d4c5b12336b106dacede4 with SHA-1 fe4d1384 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640980

Change-Id: I8464def591d2a8e6ae5c62602a0c6b5965e88fd4