Merge "Revert "Add useVrFlinger() method to SurfaceFlinger ConfigStore""