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

* commit 'a2988bd0f50fbeb15b8bbf6828b3c4857e7a43cc':
  fix CTS issue for case testSetOnScrollListener