Merge "Remove Mainline APIs for MmsManger and TelephonyManager" into rvc-dev am: 91604c2138 am: 701f4bedb7

Change-Id: I8e672e31aafc02cb3f55bfe1a09fffea1a93942e