Merge "SpatializerHelper: Deliver metrics to MediaMetrics" into tm-dev am: e2049a8968 am: 6280ea5e63

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

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