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

* commit '5e32eccc7b935eed343ae219af2efc106648cc69':
  DO NOT MERGE: Fix testActionNextAndPreviousAtGranularityLineOverText test