Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager...
Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline" am: cc9aef70 am: 30d7fd79
Change-Id: Ia279507e094b7b547ea8293465817a53cc305913