[automerger skipped] Merge "[Mainline] Move the setAlwaysAllowMmsData from SubscriptionManager to TelephonyManager" am: 442a1ca0 am: 6f87ad9a am: 018ddb2f -s ours
am skip reason: Change-Id Ibb68cd4e6a6ba49c56b313380ddf16734813459b with SHA-1 8f823800 is in history

Change-Id: I796ba1d2e4a7fe6264a319e61dc3195935c71a3c