am c7023a80: Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev

* commit 'c7023a80c971a70d3093de12427721d6bf0ca745':
  Fix bug #8656546 API REVIEW: android.text.bidi / android.text