[automerger skipped] Merge "Merge "Add methods to check if MMS is always...

[automerger skipped] Merge "Merge "Add methods to check if MMS is always allowed" am: e597bb85" into stage-aosp-master am: 8b31ba6d -s ours am: 5b585ef8 -s ours am: 700db403 -s ours

am skip reason: Change-Id Iee25d5328fe68575bf3c9ff03d70720ebc22e8d4 with SHA-1 3cde69ca is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1469910

Change-Id: I1ae9586e1be3a07c5ded7d4a0dac2fa30e80e1ce