Merge "Fix Bluetooth CTS tests to auto-detect correct package" into stage-aosp-tm-ts-dev