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

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



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