[automerger skipped] Merge "Modify PK Settings page to make it more user...

[automerger skipped] Merge "Modify PK Settings page to make it more user friendly" into 24D1-dev am: 50a16b9f -s ours

am skip reason: skipped by vdevmurari

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



Change-Id: Icad56bd7001b14ab4bc2df5831d55937c30d8550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>