Merge changes I8d15b626,I993e8da9

* changes:
  Revert "Remove ConnectivityServiceTest signature perms use"
  Revert "Use shell permission to query current user"