[automerger skipped] Update code after moving UUID conversions to their own...

[automerger skipped] Update code after moving UUID conversions to their own class am: 52915ac7 am: f887ccb8 am: 0b1ba07a -s ours

am skip reason: Change-Id I6634f44abaf0bdc528c33ee5cec564e1d7965ede with SHA-1 76956005 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I398283507a1a94262cc2410cb57e14882ea4991e