Merge "libmediadrm: fix uuid log width" am: de8e328e5a am: fc19907ba4

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

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