Merge changes from topic "product-flags2" into main am: bae67b99 am: 119292b4

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



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