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

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