am a601d44b: am a4d1e250: am 9787039d: Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev

* commit 'a601d44baa4ff21d3888dd624c016dc07c5ff937':
  Fudge getRightPaddingOffset in TextView to match clipRect.