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

Merge "Fix crash when clicking Spell Checker" into main am: e4f376f7 am: 144f0b8f am: 7aeaa3f4

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



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