Merge "aconfig: restructure integration tests" into main am: dce1fabf am:...

Merge "aconfig: restructure integration tests" into main am: dce1fabf am: e182021f am: 975aac4d

Original change: https://android-review.googlesource.com/c/platform/build/+/2672875



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