Merge "V1 is the latest version of android.media.audio.common.types" into...

Merge "V1 is the latest version of android.media.audio.common.types" into tm-dev am: b056ac6f am: 6d35fd4c am: 8ec25843

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17743155



Change-Id: I0b68800500d4d0752254b53138745213c354e143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>