Merge "Add mmd AID to grp_pwd_test" into main am: 30a1a29ba2 am: 653e82295b

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

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