Merge "Update usage of beto-rust UKEY2 APIs" into udc-dev am: cf2fc89dcd am: 4bf121fb42

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

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