Merge "Update usage of uuid crate" am: edce487663 am: f1bd2503ec am: ff68dd5d75

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2394815

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