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

[automerger skipped] Merge "MediaPlayer: fix channel mask handling" into tm-dev am: 8f122426 am: 79c54dc6 -s ours am: 16635a93 -s ours

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

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



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