Merge "Revert "Reapply "Add support for product-specific build flags""" into...

Merge "Revert "Reapply "Add support for product-specific build flags""" into main am: 5f24ce61 am: 3e228c70

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



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