Keep track of service pids.
am: cdf9472ffb

Change-Id: I727332da2de8b31e2c141a8d82ac174b7404a1a7