Merge "Fix TextServicesManagerService NPE in UserDictionaryProvider" into main am: a7143d8010 am: e9b16d8e71

Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/3222116

Change-Id: Ie1c0590e5618e6ca88e21240672c6c7546a43cda
Signed-off-by: Automerger Merge Worker <[email protected]>