[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 7495247bc0 -s ours am: 46a244c9e5 -s ours

am skip reason: Merged-In Id7c81f4dd9d7aa584e5221fcde0dc5d8a0b4d637 with SHA-1 4ec2763f1c is already in history

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

Change-Id: I7047ea65badad3148f5c3d9a6c60e829252d5c0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 3b4e572633f28d0b2b22bcdfdb94e1ccf76215a7
  1. proto/
  2. res/
  3. src/
  4. tests/
  5. Android.bp
  6. AndroidManifest.xml
  7. OWNERS
  8. proguard.flags