Merge "Deprecate AlteredCharSequence"
am: ea4916dac7

Change-Id: I40fe5070fe6475db5eb7f692b78b96e20c30b3d7