[automerger skipped] [DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain am: 404cd07e97 am: 294cbeed69 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I15979ecd70a91d4eeb549524bb2339584cfbe7b3
tree: b5cfb625593ee76970cf6ed8d3481222c73f7a0f
  1. stats/