Merge "Merge changes from topic "am-b2f669f2672c49a5b83a262bba261f9f" into android12-tests-dev am: d8a59345e1" into android12L-tests-dev