Merge "Require that caller holds  SEND_SMS and  MODIFY_PHONES_STATE permissions" am: ee48176ad6
am: f220cdfca4

Change-Id: Ic809d19c8d5542b8f3a7d2a8b245a4db971165e3