Merge changes Ia219ff78,I3fd52525 into mnc-dev

* changes:
  Add phone permissions to Shell
  Add adb shell command to register/unregister phone accounts