Merge "Enable access to display/manager socket in surfaceflinger" into oc-dev
am: 0e9dcf6657

Change-Id: I67fd499a0fbd76bebc63e4b0eb08842ace5511f9