Merge "SoundPool: Improve single stream SoundPool handling" am: 0f8c08544a

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

Change-Id: I3c7531be6f4783a87f54c01329eb519c15f95318