[automerger skipped] Merge "Merge Android 12" am: b0cc975fe1 -s ours am: 8faa4ced33 -s ours am: 59069153c9 -s ours

am skip reason: Merged-In I203c591917c9da5b44f12c9822522e0f4cc15599 with SHA-1 a6ae5c949e is already in history

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

Change-Id: Ic91e2d8ca8bb10d2c41c49bd019a9874febd55d4