Merge "Ensure the DUT is bondable during test" am: 286fd77cb9 am: 255d297f0b

Original change: https://android-review.googlesource.com/c/platform/cts/+/1615644

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifec7b802e7e8bb1616059db42c604650c2df717e