[automerger skipped] [DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7 am: 091c73f768 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ida2e692c72cd1c79d95ae6b0e99196d05fa843e0