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

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

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