[DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain am: ac51bf8a40

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

Change-Id: I7a1a42f3d64dd968f6b09de3b6717c97773daa25