Merge changes I67dbf04a,I032f6741

* changes:
  Settings: Disable failing assert
  Settings: Fix assertThat in test

tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java

@@ -155,7 +155,8 @@ public class BluetoothPairingDialogTest {
 
         // check that showSoftInput was called to make input method appear when the dialog was shown
         assertThat(view.isFocused()).isTrue();
-        assertThat(imm.isActive());
+        // TODO(b/73892004): Figure out why this is failing.
+        // assertThat(imm.isActive()).isTrue();
         verify(imm).showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
     }