Merge "Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF" into main
tree: 8ef67903b22ee63ca014437abe14fa049e2e8e56
  1. res/
  2. robotests/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. OWNERS