Merge "DO NOT MERGE: Fix testActionNextAndPreviousAtGranularityLineOverText test" into kitkat-cts-dev am: ee06978164  -s ours am: 5e32eccc7b  -s ours am: dd944752a1  -s ours am: 61853beb70  -s ours
am: e98b8dbad9

* commit 'e98b8dbad99820e0c94779a924cbc1df6b469e56':
  DO NOT MERGE: Fix testActionNextAndPreviousAtGranularityLineOverText test