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

[automerger skipped] Merge "Add methods to check if MMS is always allowed" am: e597bb85 am: 0bda45ee am: 561c04a0 am: b73b7b85 -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: Ieebdcdb74ea9245d6c66b49d02cf0512bb645884