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

Change-Id: I1bda5680917e63586f6f88a3314ebd86d8138c64