am d201e0ee: Merge "Modify UiAutomator cts tests and app to improve scroll check" into jb-mr2-dev

* commit 'd201e0ee4310094c28af35bc7ad1c761b16062d6':
  Modify UiAutomator cts tests and app to improve scroll check