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

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



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