[automerger skipped] Merge "Add a.hardware.audio.common and...

[automerger skipped] Merge "Add a.hardware.audio.common and a.media.audio.common" am: 1c2c2840 am: 03990e11 am: d695dfdc am: e2a927ed -s ours

am skip reason: Merged-In Ia953963380794591eae6b1140d180dc36dfbe7ca with SHA-1 53a14bc6 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1937128

Change-Id: I6bba60c44adf82c2015855ceb297a56eb534e8dd