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