Merge "Updated metrics logging IDrm implementation" am: 4608daca am: 4e9a78da

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



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