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: 7f32fb1a

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



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