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: 27fb6b05

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



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