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

Change-Id: I1267c2ac8021bd96a8e01b40b573976e36408676