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: 036a36ff

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



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