[automerger skipped] Merge "[Mainline] Move the setAlwaysAllowMmsData from SubscriptionManager to TelephonyManager" am: 2437377dc1 am: 6d30336c3a am: 0fafdacca4 -s ours
am skip reason: Change-Id I8c02e7bf3b66dbea5e0e56ebcff6326ccf5a460e with SHA-1 d5c246ec5e is in history

Change-Id: I2ca608c0fc4cceb9eb6578a38ceb1dbeb51e6971