Merge "New product config flag to gate blueprint modules" am: ed055c7f am: c98a1d93

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



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