Merge "Merge "Remove rundundant <test> tag" into android14-tests-dev am: 629a92deb0" into main