Merge "Updated metrics logging IDrm implementation" am: bcd5d085 am: e43420fc

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



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