Merge "DrmMetricsLogger: fix uuid-lookup endianness" am: 162278af85 am: 4762eb494a am: 4620731a41

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

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