Merge changes I7758e006,I49bb2315

* changes:
  Move getServiceForUserIfCallerHasPermission() to Trampoline
  Move dump() to Trampoline