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

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



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