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

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



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