[automerger skipped] Merge "Audio HAL: add channel mask and tags to track metadata" am: 0f320975 am: 7e859f1b am: 6a11026b -s ours

am skip reason: Change-Id I06a63963e1be53bd965792dec607fa67a89f28bf with SHA-1 9457917e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9159a882b80775785f2da71e4f127e08072cbba