[automerger skipped] Merge "[DO NOT MERGE] Rollup changes from R" am: c3288adee0 am: 4b7a3ea0a9 -s ours

am skip reason: subject contains skip directive

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

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