[automerger skipped] Merge "SoundPool: Avoid busy waiting during stream restart" am: dfb0754d am: 361882fa am: a3b80e01 -s ours am: 93501a33 -s ours

am skip reason: skip tag Change-Id Iae794bc957869426a4e1e27cd3c088aa9dd83208 with SHA-1 0821db29 is already in history

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

Change-Id: I33831d2d233f0c3f00fd6709d1cd03a292e0aedd