Merge "Make InputMethodSystemProperty#MULTI_CLIENT_IME_ENABLED testable." into qt-dev

am: b7abebde5b

Change-Id: I2224102556d110021150ddb6eea90bb0be2c2f36

api/test-current.txt

@@ -3474,6 +3474,11 @@ package android.view.inputmethod {
     method public boolean isInputMethodPickerShown();
   }
 
+  public class InputMethodSystemProperty {
+    ctor public InputMethodSystemProperty();
+    field public static final boolean MULTI_CLIENT_IME_ENABLED;
+  }
+
 }
 
 package android.view.inspector {

core/java/android/view/inputmethod/InputMethodSystemProperty.java

@@ -17,6 +17,7 @@
 package android.view.inputmethod;
 
 import android.annotation.Nullable;
+import android.annotation.TestApi;
 import android.content.ComponentName;
 import android.os.Build;
 import android.os.SystemProperties;
@@ -26,6 +27,7 @@ import android.os.SystemProperties;
  *
  * @hide
  */
+@TestApi
 public class InputMethodSystemProperty {
     /**
      * System property key for the production use. The value must be either empty or a valid
@@ -87,6 +89,7 @@ public class InputMethodSystemProperty {
      *
      * @hide
      */
+    @TestApi
     public static final boolean MULTI_CLIENT_IME_ENABLED = (sMultiClientImeComponentName != null);
 
     /**