[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 187c51de8b -s ours am: 21f1bc963d -s ours

am skip reason: Change-Id Iff102d5d44046659da3ebe0b13b7f3390f056bcc with SHA-1 c1541edc08 is in history

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

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