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

* commit '0b91d64c3945c9c60a18466edee4137246a8350a':