Merge "libmediadrm: fix uuid log width" am: de8e328e am: fc19907b am: 8b35aee8 am: 4d0f8f8d

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



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