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