[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 97a6f96b45 -s ours am: 4a388d04f8 -s ours am: 285f0a0ebe -s ours am: a1ec01f2c9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8c9bff7185ff8f3063f22c04218691bad46dc73c