am 173ef9f6: am 6319a35f: am 7f967eeb: Merge "Remove CTS tests which require MODIFY_PHONE_STATE permission." into lollipop-mr1-cts-dev

* commit '173ef9f61495555b74ae645b75b34b277b3a1646':
  Remove CTS tests which require MODIFY_PHONE_STATE permission.