Merge "MediaMetricsService: Deliver Spatialization atoms to statsd" am: 7a8e3dfee1 am: c06ec5b4d2

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

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