Merge "Fix crash when clicking Spell Checker" into main am: e4f376f7

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



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