[automerger skipped] Merge "MediaMetricsService: Deliver Spatialization atoms...

[automerger skipped] Merge "MediaMetricsService: Deliver Spatialization atoms to statsd" into tm-qpr-dev am: 72cb1621 -s ours am: 3b4ccb28 -s ours

am skip reason: Merged-In If35e4feeef488079ddaab131e60d37d8460b4d5f with SHA-1 5bef3f20 is already in history

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



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