[automerger skipped] Merge Android 12 am: 4aa283fea9 -s ours am: ab0c80d400 -s ours am: ac671c07e5 -s ours am: 2045c4cad5 -s ours am: f3cc3018ed -s ours

am skip reason: Merged-In If0a2b824f3f1d1e1052eda860e2a58106406118b with SHA-1 e5d76bb306 is already in history

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

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