[automerger skipped] Merge "Merge Android R" am: 726339a27c -s ours am: b5a25cc133 -s ours

am skip reason: Change-Id Id7ed53db36cdb9e96c352253ca5c05cc193bb90b with SHA-1 187c51de8b is in history

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

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