Merge "prevent unintended m bp2build "" when running b" am: 54dbc8c3 am:...

Merge "prevent unintended m bp2build "" when running b" am: 54dbc8c3 am: 83cd3636 am: 7a1cca44 am: 4e72e755 am: f6db079d am: 0679fcf9

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



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