Merge "Some tweaks to the aconfig flag collection logic" into main am: 6c2cd902 am: 4782aa50

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



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