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

* commit '8bc09dfb1cc7b851e0f571cdc49a6f7c25279d4e':
  Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS