Merge "Fix BluetoothPairingDetailTest fail"