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

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



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