Merge changes from topic "user-key-rename" into main am: 7490fc591b

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

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