[automerger skipped] Merge Android R am: e6f0cdb41a -s ours am: aa808052b8 -s ours

am skip reason: Change-Id Ida0d85395e88f56b278d69373edaed5d0421d9b4 with SHA-1 dc0f13e932 is in history

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

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