Merge "Add bidi wrapping support for CharSequences" into nyc-mr1-dev
am: a0336fa819

Change-Id: Ifcf24e508893216ec59a6dcfcc10e869e3b5be9d