Merge changes from topic \'grapheme-dr1.5\' into mnc-dr1.5-dev
am: 9f2c939730

* commit '9f2c939730730e76afc46e891b82499b499503e1':
  Respect grapheme clusters in Layout#getOffsetForHorizontal.
  Fix: Cursor can be at an invalid offset in EditText.