[automerger skipped] Merge "Ensure only MMS is allowed when data disabled but...

[automerger skipped] Merge "Ensure only MMS is allowed when data disabled but MMS allowed" am: 5fa707ca am: 48d0f7dc -s ours am: 52b42e33 -s ours am: f0b74dbc -s ours

am skip reason: Merged-In I530180f279f2eea1b82f4e59c60c4f679625a2ce with SHA-1 e1fa972b is already in history

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

Change-Id: Ifa58111f99a0f39dfcc2b5577ba11f44f1183458