am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev

* commit '3a3f33dea09db8279d0666e9d3bd04d1a80e0c8a':
  Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS