Merge "SoundPool: Avoid busy waiting during stream restart" am: dfb0754d31 am: 361882fae0

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

Change-Id: I37868ad22d887b2e75544126499a7cc4da9298e9