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

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

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