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