[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 77e2ba27cc -s ours am: 9c66a5e535 -s ours

am skip reason: subject contains skip directive

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

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