am 0b293029: Merge "DO NOT MERGE Fix AutoCompleteTextViewTest Flakiness" into jb-dev

* commit '0b29302905127f527e73a282b5e0bcb12d39ac43':
  DO NOT MERGE Fix AutoCompleteTextViewTest Flakiness