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

Change-Id: Ifff0405759e6d18528ac06dbe5275e44f9d1012c