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

am skip reason: Merged-In If20125b79df6624dbdbd39ef6f1661473fa03972 with SHA-1 3757520e24 is already in history

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

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