Merge changes from topic "presubmit-am-f60b0fa80002426f9c1a30b5864b3249" into sc-qpr1-dev am: 1585a642d9

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

Change-Id: Ie3a79a387e85ec3c84efa450d05a67e99edeb2d1