[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2

Change-Id: I6995aab201805b64e81022db295356ef8abda30c