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 am: 5ce402ea

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



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