[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 97a6f96b45 -s ours am: 4a388d04f8 -s ours am: 285f0a0ebe -s ours

am skip reason: subject contains skip directive

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

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