Merge "Allow passthrough service manager to register client PIDs."
am: 2f2c6ae253

Change-Id: I2f94134296441a5e4956d0a28b9225294a6992ab