Merge "Audio HAL: add channel mask and tags to track metadata" am: 0f320975fc am: 7e859f1b9d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib99ab61df793d384f27f1c6a4afa76176797bcc4