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

Change-Id: I831efeddbebd4ff65d2a64f628eab84f84ecfa73