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

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



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