am a0eb87db: Merge change 7619 into donut

Merge commit 'a0eb87db12aed10bf578e06a35cf89d1779d7cf6'

* commit 'a0eb87db12aed10bf578e06a35cf89d1779d7cf6':
  Fixes #1861763. Prevents IllegalArgumentException in AbsListView on focus