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

[automerger skipped] Merge "MediaPlayer: fix channel mask handling" am: b7047eb9 am: 1d29036c -s ours am: 3386e380 -s ours am: 39577195 -s ours

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

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



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