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

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



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