Merge "Fix DrmMetricsLogger uuid copy size" am: 2284fb802b am: 0e5c69fcc2 am: 3717598e29

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

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