Merge changes from topic "product-flags" into main am: 253bd067 am: cf862402 am: 990593ae

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



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