am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev

* commit '50c36b9da210ff98b358dff525edc2cd74113ca5':
  Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS