Merge "Fix the way how test waits for user to get locked" into android11-tests-dev