Merge "MediaMetrics: Add new AudioTypes" into tm-dev am: af605877 am: cbcbe554 am: d378f6fe am: 057b3d32

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



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