Merge "Atest: index testable modules within ModuleInfo()" am: 50f255d5bc am: 310ed963ef am: 0948e27c00

Original change: https://android-review.googlesource.com/c/platform/tools/asuite/+/1991610

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