Merge "Fix a Bluetooth test instruction" into stage-aosp-tm-ts-dev