Merge "Enable access to display/manager socket in surfaceflinger" into oc-dev