[automerger skipped] Merge "[DO NOT MERGE] Rollup Cert-related changes from R"...

[automerger skipped] Merge "[DO NOT MERGE] Rollup Cert-related changes from R" am: 01ec6774 am: 73a28754 -s ours am: 3330abff am: f85f6c82 am: 5e2a845c -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547

Change-Id: If55e1cd44fd8d49b9e2c220248e4f434ee323c34