[automerger skipped] [DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7 am: 091c73f768 -s ours am: f853d0fd25 am: 7e539d9aa0 am: c003e578c0 -s ours am: fda780ce99
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547 Change-Id: Ibbb47a72d08ec6bfcf77b5fd946aac30f215d741
This commit is contained in: