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

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

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



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