Merge "Merge "SpatializerHelper: Deliver metrics to MediaMetrics" into tm-dev...

Merge "Merge "SpatializerHelper: Deliver metrics to MediaMetrics" into tm-dev am: e2049a89 am: 6280ea5e" into tm-d1-dev-plus-aosp am: 256ad6d8 am: 976fd2fc

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



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