Merge "DO NOT MERGE Fix AutoCompleteTextViewTest Flakiness" into jb-dev