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

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