Merge "If the ServiceRecord already has a ProcessRecord attached in...

Merge "If the ServiceRecord already has a ProcessRecord attached in startServiceLocked(), whitelist the process at that point (previously we'd just set the valiable to true, and not add the token)" into qt-dev am: 4167a1b2
am: 835c1dc7

Change-Id: I22fd19d0553bc9c77ebf39e6014ed25f2b827aa1