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

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