Merge changes from topic "presubmit-am-edf13aaf1a684355828c2e6ebf9e9d27" into sc-qpr1-dev am: 5920e28f3f

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

Change-Id: If885cdd3ba44014c592c37ca3b3c56e875153e45