am 13d6e4b3: Merge changes Ia219ff78,I3fd52525 into mnc-dev

* commit '13d6e4b33b1c34c256d62837a0cda55fae578884':
  Add phone permissions to Shell
  Add adb shell command to register/unregister phone accounts