Merge "Translate error code & security level in DrmMetricsLogger" am:...

Merge "Translate error code & security level in DrmMetricsLogger" am: 2bd8ca62 am: 73e4f295 am: 49c7f2c3 am: 94841190

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



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