Merge "NuPlayer: Update code for channel mask conversion refactor" into tm-qpr-dev am: 6bda925a

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



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