[automerger skipped] Merge "Remove Mainline APIs for MmsManger and TelephonyManager" am: f8bd172434 am: 5fe578fabd -s ours am: 55e72e7e0c -s ours am: b9c4cc6bb7 -s ours am: 17ac0f4710 -s ours
am skip reason: Change-Id I44682d1f33eee02d1dcf57f4de8ce2df0a9b126d with SHA-1 8ac7ce5a5d is in history
Change-Id: I2469ff81df015766ee01ce31a88176d2ac5f60da
This commit is contained in: