[DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7

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

Change-Id: Ie170b54b9b15d3abff3ec883d943d597b3719a77