Merge "Remove diffs of flags files that included in product SBOM." into main...

Merge "Remove diffs of flags files that included in product SBOM." into main am: 13acefe9 am: f7c5f647 am: 47e53c54 am: bd61c4c7

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



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