[automerger skipped] Merge "NuPlayer: Update code for channel mask conversion...

[automerger skipped] Merge "NuPlayer: Update code for channel mask conversion refactor" am: a05abbf5 am: 3fbaa20e am: 10571419 am: c8b8a98c -s ours

am skip reason: Merged-In Ieaacaffb8db16b03a706e9e4ab0691d791fa7380 with SHA-1 66b2da50 is already in history

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



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