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: f78b8051 am: aeb9e638

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



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