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

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



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