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

Change-Id: I275ede9c64efbc28f608ce2f68be0f0431f1b88e