[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: e5d76bb306 -s ours am: 5f082000ab -s ours

am skip reason: Merged-In I91a2cd8d51f1df6ac6fa53eb707800f3ecae12b6 with SHA-1 31bda7cf4b is already in history

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

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