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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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