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

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



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