Merge "Handling multiple profiles for PK layout selection" into udc-dev am:...

Merge "Handling multiple profiles for PK layout selection" into udc-dev am: 5f3e365c am: 717f21ed

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



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