Merge "Revert "Dumpsys also includes service PIDs."" am: 43b0ed12ae
am: 8be127e6c8

Change-Id: I383203b4be9dddcd6991ad936a2451306434ce25