Optionally turn screen back on after the ScreenOff CUJ.
Also updated the CUJ to use platform-test-options. Bug: 144721773, 118122395 Test: Manual Change-Id: Id0bff1ed3bf93bf91a82147d423de4dfebac4614 (cherry picked from commit 706448be9cb8d00abb389936dafe8ba80ac36fd2)
Loading