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

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

Change-Id: I5852772007c22b46104450a354cf884894086159