am 881575a3: am 543a4d90: am a2988bd0: am 3ecab41b: am f7443794: Merge "fix CTS issue for case testSetOnScrollListener" into jb-dev

* commit '881575a33dd67b88a536ce87a0cd441bc94f232e':
  fix CTS issue for case testSetOnScrollListener