Merge "[DO NOT MERGE] Rollup changes from R" am: c3288adee0

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

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