Merge "Add a.hardware.audio.common and a.media.audio.common" am: 1c2c2840...

Merge "Add a.hardware.audio.common and a.media.audio.common" am: 1c2c2840 am: 03990e11 am: d695dfdc

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

Change-Id: Ifb11629a6fd8e2711692f92d1a61e465c3108780