Merge "CP: Screen on and stay on for GLES tests" into nougat-cts-dev