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

Change-Id: I92766efee7b312e9dd09bc7fcac42850f457a5e9