Merge "surfaceflinger and apps are clients of Configstore HAL" into oc-dev