Merge "Fix LoginActivityTest" into android11-tests-dev