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

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

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