[automerger skipped] Merge "Fix crash during cursor moving on BiDi text" into oc-mr1-dev
am: 2cd112082b  -s ours

Change-Id: I075c5213415607a56dff509e79c76e089f6df04e