Merge "Revert "Revert "Do not start VrManagerService if VR is not supported"""