[automerger skipped] Merge 10952656 am: 4df1a75313 -s ours am: 3fa822c7fc -s ours

am skip reason: Merged-In I2496fd9c0b9b51d315e9e8c7da07543bcaff53e3 with SHA-1 d7994c411b is already in history

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

Change-Id: I4c9b14fbd9747aabb4b89cb889683a513982c71d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 13b2549d87a7b1382eda3e4715990447ef923fa9
  1. res/
  2. robotests/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. OWNERS