[automerger skipped] [DO NOT MERGE] Rollup changes from R am: 7830ab3251 am: af5d2474e2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia1dc5bb3ab03f5313808dbb6144b4309fa3f5894
tree: 7c44accdbe12680e5973c740a7ea5e935874bf52
  1. Android.bp
  2. AndroidManifest.xml
  3. CleanSpec.mk
  4. NOTICE
  5. OWNERS
  6. res/
  7. src/