Merge "aconfig: adjust integration tests to correctly set flag values" into main am: df7014c2

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



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