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

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

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