Merge changes from topic "am-ab6eba06ba694c37b36a5aafe16c8c9a" into main

* changes:
  [automerger skipped] Merge "Add mmd AID to grp_pwd_test" into android15-tests-dev am: 827765b57f -s ours
  [automerger skipped] Add mmd AID to grp_pwd_test am: 40457eab82 -s ours