Consolidate some conflicting Bluetooth CTS tests that emerged after
migrating all Bluetooth GTS tests to CTS

Bug: 234690607
Bug: 234690739
Test: atest BluetoothAdapterTest BluetoothDeviceTest SystemBluetoothTest
Change-Id: Ia6d0552399e3245d39d925977b56aaadb52e3b3e
3 files changed