[automerger skipped] Merge "SoundPool: Fix channel mask reporting" am:...

[automerger skipped] Merge "SoundPool: Fix channel mask reporting" am: 4b50dd4f am: 82c42ad3 am: 33ba555a am: a6d45979 -s ours am: 4be217f4 -s ours

am skip reason: Merged-In I5231f989183300a6b2354bbd4bbca991b1e70cb8 with SHA-1 b78f7a65 is already in history

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



Change-Id: Ib76eeabdf62dcb59c7796d88bf2bdd66eeaa8e3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>