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