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

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

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



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