[automerger skipped] [DO NOT MERGE] Rollup changes from R related to...

[automerger skipped] [DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain am: ac51bf8a am: 294cbeed -s ours am: 5f7b19c7 am: ef69c1a6 am: 8a0209e3 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363580

Change-Id: I9714fb2a2b120b4fac710a168c3578ccea14236a