[automerger skipped] Merge "Merge Android 12" am: b0cc975fe1 -s ours am: 8faa4ced33 -s ours am: 59069153c9 -s ours am: 44e848479c -s ours am: 0b551fa42d -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: I0aae3f7651b2b84c64cbada527cee89739b3a0a0