am 3a15fbd7: Merge change 5581 into donut

Merge commit '3a15fbd7df56e44060c78d7832fbea895ceb9bbf'

* commit '3a15fbd7df56e44060c78d7832fbea895ceb9bbf':
  Add a null check in an AutoCompleteTextView callback to prevent a crash.