Merge "Some Bluetooth LE Secure Client tests failed with Android10"