Merge "DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into kitkat-cts-dev