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

Change-Id: I2338964543dd75c61d4c4f9fd91637124865c3b3