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

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