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: 9bbc2099

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



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