[automerger skipped] Merge "Add mmd AID to grp_pwd_test" into android15-tests-dev am: 827765b57f -s ours am: 16159562f4 -s ours am: 72e09e6ee0 -s ours

am skip reason: Merged-In I3524c95f20bee565d1f5ec94468b62e625aa1776 with SHA-1 08fc8bd525 is already in history

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3387897

Change-Id: I17c629a1125c54a87c76711c47a2ecc9cd4f6c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>