[automerger skipped] Merge "aconfig: adjust integration tests to correctly set...

[automerger skipped] Merge "aconfig: adjust integration tests to correctly set flag values" into main am: df7014c2 am: 898ed5bc am: 4b532889 -s ours

am skip reason: Merged-In I1acdf9442a465f20f71bcda9b15eb69058aa4b3a with SHA-1 d669fa67 is already in history

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



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