[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 7c9d3186d0 am: e8087cb78a -s ours am: d5a3518988 -s ours am: 83960c4916 -s ours

am skip reason: Change-Id I3f019cb8929871dfed63f6cae915bccdfa7928f3 with SHA-1 4c0f2da75a is in history

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

Change-Id: I708a6bb94586fa2f5104786402b304932c6cb801