[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 61b5cd430f -s ours

am skip reason: Change-Id I0711c10ffa93994acdf978e62d61227eb3f45974 with SHA-1 1b79ffa57f is in history

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

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