Merge "Properly track where a build flag is declared" into main am: 5078551e am: aac618bb

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



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