Merge "Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF" into main am: 8f3e198627

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

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