[automerger skipped] Merge "Merge Android 12" am: 9f0772b75c -s ours am: 8b7cad2199 -s ours am: 94645f3065 -s ours

am skip reason: Merged-In I2ef210ed313638afa9db8004f1ebbf5508d06911 with SHA-1 99ac1aedba is already in history

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

Change-Id: Ibfc6bb9bceba8d08af521959838dc56fe8db7797