Merge "Remove rundundant <test> tag" into android14-tests-dev