[automerger skipped] [DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain am: ac51bf8a40 am: 294cbeed69 -s ours am: 5f7b19c7aa am: ef69c1a670

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

Change-Id: Ic8507306632667ca591a3f49e37f93e967e3baab
This commit is contained in:
Rubin Xu
2020-07-17 09:35:20 +00:00
committed by Automerger Merge Worker

Diff Content Not Available