[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dc0f13e932 -s ours am: e7df250ae8 -s ours

am skip reason: Change-Id Idb5b8233ce65d6671a5783abe25b7ed2679953f7 with SHA-1 ed6657fcfb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Mms/+/12470139

Change-Id: I34eb9377ea637832c1590c09878f9164a8ab2a1c
tree: b1a95b500b18e0ed41f181fba5aca3f4735e5dd4
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags