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

Change-Id: I3564d4dbd6f5931feefa8b05027c27d5c1249711