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

Change-Id: I6bf60035d8d63b99e340176e74e1acd5d6c05d59