[automerger skipped] Merge "Merge Android 12" am: b0cc975fe1 -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: I5c40bd5e40f0707aad8d6f892635c048d1fe38c4
tree: 2842b4df5a63d285f3a8a7121175800c1b8e5f5c
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. NOTICE
  7. proguard.flags