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

[automerger skipped] Merge "[DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain" am: 3846b1e2 am: 70b6c132 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I21f23724b7ebf022ff35596dd859057efe890eda