[automerger skipped] Merge Android 12 am: 4aa283fea9 -s ours am: ab0c80d400 -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: I9066ed1f9fee8fe995b0627818b791ea84ac5b67
tree: 0ab2c9d0553008a7d24fc7c557e20a6361df03dd
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags