Merge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions" am: ee48176a am: f220cdfc am: 663150a7 -s ours Change-Id: I6afc251ec22979c349f5255a9c6b297e008818ea