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

[automerger skipped] Merge "MediaMetricsService: Deliver Spatialization atoms to statsd" am: 7a8e3dfe am: c06ec5b4 am: 681a385d am: 45e2fae1 -s ours am: 2b4078d2 -s ours

am skip reason: Merged-In If35e4feeef488079ddaab131e60d37d8460b4d5f with SHA-1 05874e8c is already in history

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



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