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

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

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