[automerger skipped] Merge "audio: Add AIDL definitions for...

[automerger skipped] Merge "audio: Add AIDL definitions for Playback/RecordTrackMetadata" am: f96d2ef9 am: 6fc60372 am: 05746847 am: 9b865ed3 -s ours

am skip reason: Merged-In I7064c3819d4c8e61981542ca2ccc52ca992a4ef8 with SHA-1 32a8ef3d is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1936041

Change-Id: Id1c3c043cd676cf94ec6cec3f5fbee3a2c437677