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

Change-Id: I77e124b08105094b1a918162891314b7531716f6