[automerger skipped] Merge "Use hexadecimal toString for AudioUuid" into...

[automerger skipped] Merge "Use hexadecimal toString for AudioUuid" into udc-qpr-dev am: 6472606f -s ours am: 87f0161d -s ours

am skip reason: Merged-In Ia61e8caadab38226feb4c49bd92bb5b83026e80b with SHA-1 007caf0e is already in history

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



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