[automerger skipped] [DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7
am: 091c73f768
-s ours am: f853d0fd25
am: 7e539d9aa0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547 Change-Id: I0d3b00f2cebf8122279aca1281afaf48107edfa1
This commit is contained in: