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

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

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