Merge changes from topic "cp-visibility-test-cts" into qt-dev

* changes:
  Fix ActivityVisibilityTests#testTurnScreenOnAttrNoLockScreen failed
  Fix ActivityVisibilityTests#testTurnScreenOnAttrNoLockScreen failed