Merge "[Mainline] Move the setAlwaysAllowMmsData from SubscriptionManager to...
Merge "[Mainline] Move the setAlwaysAllowMmsData from SubscriptionManager to TelephonyManager" am: 10475068 am: d9a351e9
Change-Id: I5cf1685055d8384b8395d0178f52a19173386ecc