Merge "[DO NOT MERGE] Rollup Cert-related changes from R" am: 01ec6774e6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547 Change-Id: I5c4f7993abf41fbbefca12962061451345c2e62e
This commit is contained in: