Merge "Make BLE CTS tests beacon-agnostic." into mnc-dev