Merge "Fix TextViewTest#testProcessTextActivityResultNonEditable"