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

Merge "Fix crash when clicking Spell Checker" into main am: e4f376f7 am: 8a2a1274 am: 1e4c05ef

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



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