Merge changes from topic "product-build-flags" into main am: 75270325

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



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