am a009daf9: am 6f692d57: Merge "Revert "Revert "Remove deprecated OnItemSelectedListener and OnItemClickedListener""" into lmp-mr1-ub-dev

* commit 'a009daf971c18591d9ff3318c476c342926af8d3':
  Revert "Revert "Remove deprecated OnItemSelectedListener and OnItemClickedListener""