[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