[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a6ae5c949e -s ours am: 224e67288f -s ours am: cd2a49455e -s ours

am skip reason: Merged-In I484fe79efdf22d5e7eec7d7bee43a7f622115244 with SHA-1 cc26be6127 is already in history

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

Change-Id: Ia6c21d08bfdce38dc71c01d87f0eb1b1696457a2
tree: 2842b4df5a63d285f3a8a7121175800c1b8e5f5c
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. NOTICE
  7. proguard.flags