[automerger skipped] Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline" am: cc9aef705a am: 30d7fd79c9 am: 4d2b61d408 -s ours
am skip reason: Change-Id Ia591e82e1a55f36c98e7b00965532ff0762e1e77 with SHA-1 9b7f5ad91f is in history

Change-Id: Ie6afe1a56f363fb6ed04a1bfe286f0b4b2f38588