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

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



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