Merge "SoundPool: Clean up Stream::play_l logic for garbage collection" am: 3c44833a91 am: c69cfc5a7c am: e434fc68e4 am: 95292b064a

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

Change-Id: I8daee4a9ccc93ce9c6452de601da9a7553d1ac60