am cff19c1a: Merge change 4539 into donut

Merge commit 'cff19c1a014284dce2577f82d931e4c65edd437e'

* commit 'cff19c1a014284dce2577f82d931e4c65edd437e':
  Fixes #1925003. Make ListView honor the android:choiceMode XML attribute.