Merge "SoundPool: Update queue only if streamID matches" am: f0f20c17e0 am: 27383c906c

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

Change-Id: I19d418c46de5e0a62d63ef5c89d31b942f5dea84