Merge "IDrm metrics to statsd" am: f5e292b25b am: b756175347

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

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