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

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



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