Merge "MediaPlayer: fix channel mask handling" into tm-dev am: 8f122426 am: d892f8d8

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



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