Merge "Mark android.view.inputmethod.InputMethodInfoTest as @SmallTest"