[automerger skipped] Merge "New product config flag to gate blueprint modules"...

[automerger skipped] Merge "New product config flag to gate blueprint modules" into tm-qpr-dev am: 1658acef -s ours

am skip reason: Merged-In Ica82a8f65cbfda600d72fc54fb873c1eaa1666a7 with SHA-1 00114d44 is already in history

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



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