Merge "grp_pwd_test: Hack around "trunk stable"." into android14-tests-dev