tree 5a1a436f9024c5d97b63a761e33f0309c476d336
parent a4e1b7a9a931ccf991abc323dd9d8069896797fa
parent 7830ab325155c712bb7bbe3e1bef9d2a714730f2
author Alex Johnston <acjohnston@google.com> 1594975418 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594975418 +0000

[DO NOT MERGE] Rollup changes from R am: 7830ab3251

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

Change-Id: Iaf727935c6195a71d684188629e5c9cafae48b46