Merge "BluetoothCddTest: Verify CDD requirements in CTS"