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

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



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