[automerger skipped] Merge "MediaPlayer: fix channel mask handling" into...

[automerger skipped] Merge "MediaPlayer: fix channel mask handling" into tm-dev am: 8f122426 am: 191765a6 -s ours

am skip reason: Merged-In Ie8b57e20927d90e45b0f69a23a6777af7a39794d with SHA-1 c18a976b is already in history

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



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