faft: Rewrite the test logic of FwScreenCloseLid FAFT

Rewrite the test logic of FwScreenCloseLid to support:
 - Keyboard controlled recovery switching;
 - Close lid during the new TO_NORM screen;
 - Wait longer for the screens without timeout.

BUG=chromium-os:32976
TEST=run firmware_FwScreenCloseLid on Link passed.

Change-Id: I4fd3404635d0068289c35dd26d93a98de0b9ea31
Reviewed-on: https://gerrit.chromium.org/gerrit/28585
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Ready: Tom Wai-Hong Tam <waihong@chromium.org>
Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>
diff --git a/server/cros/faftsequence.py b/server/cros/faftsequence.py
index 4c6366b..1989608 100644
--- a/server/cros/faftsequence.py
+++ b/server/cros/faftsequence.py
@@ -707,6 +707,12 @@
         self.servo.lid_close()
 
 
+    def wait_longer_fw_screen_and_close_lid(self):
+        """Wait for firmware screen without timeout and close lid."""
+        time.sleep(self.FIRMWARE_SCREEN_DELAY)
+        self.wait_fw_screen_and_close_lid()
+
+
     def setup_tried_fwb(self, tried_fwb):
         """Setup for fw B tried state.