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

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

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