am 3ecab41b: am f7443794: Merge "fix CTS issue for case testSetOnScrollListener" into jb-dev

* commit '3ecab41b342a5dea97d5df186bcd54b0bb288c13':
  fix CTS issue for case testSetOnScrollListener