Merge "[Mainline] Move the setAlwaysAllowMmsData from SubscriptionManager to...
Merge "[Mainline] Move the setAlwaysAllowMmsData from SubscriptionManager to TelephonyManager" am: 442a1ca0 am: 6f87ad9a
Change-Id: I92a8e6e49fc5aa9da0d248077ae10457e22d06fd