Merge "Add mmd AID to grp_pwd_test" into android15-tests-dev