[automerger skipped] Merge "IDrm metrics to statsd" am: f5e292b2 am:...

[automerger skipped] Merge "IDrm metrics to statsd" am: f5e292b2 am: b7561753 am: eb0d989f -s ours

am skip reason: Merged-In Ia0fdd28aa5935809a0e961ef3098bf9354dede40 with SHA-1 8ceba759 is already in history

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



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