Merge "aconfig: adjust integration tests to correctly set flag values" into...

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

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



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