[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: e5e476536f -s ours

am skip reason: Change-Id I4e02ba38f70d8358ae2e70a9920320e4b09f3d61 with SHA-1 61b5cd430f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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