Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev
am: 4315c1e3d5

Change-Id: I8ec2d24a8b6bda9641bbb627e69521914240942f