Merge "[conflict] Merge "Fix LoginActivityTest" into android11-tests-dev am: 5840ee0496" into android12-tests-dev