am bac4788a: am 983ea522: Merge "Revert "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend"" into lollipop-cts-dev

* commit 'bac4788aa7f8d1608414afa0ff91cecb087ab490':
  Revert "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend"