Merge "Fix keyboard settings crash in multi-user case" into tm-dev am: 897b72eb am: 3cdb4ba0

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



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