Merge "Test: Adding Test Cases to AidGroupTest" into main am: 61258e6162

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3406702

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