[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: 0cb2bb83 am: e260ebd9

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

Change-Id: I6fe5213691b19719f9346b0713fa1049a5eafa69