Merge "[DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain" am: 3846b1e2c2

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

Change-Id: I45105973e1a26af563ad72c79b48937100e9f319