Merge "SoundPool: Fix channel mask reporting" into tm-qpr-dev am: 45eb2870 am: b04fb9e7

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



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