Merge "Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF" into main am: c93312c822 am: a99e583dc1

Original change: https://android-review.googlesource.com/c/platform/packages/apps/CertInstaller/+/3062364

Change-Id: I8a80deca552ff962e0f538de64a5b619ed74e6a8
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: d4fcee044df381d21f4e03cc6ecc70deb3f54057
  1. res/
  2. robotests/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. OWNERS