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

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



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