Merge "MediaMetrics: Add new AudioTypes" into tm-dev am: af605877 am: 21a95f54 am: 874a6b68 am: 6565ff84

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



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