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

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

Change-Id: Ib4eb5416d231200c783ff2f2b09d856b4355d7fc