Fix: 217730256 Bug: 222537368 Test: Added test in EditTextTest (will merge later when reviewed). Merged-In: I78354a0f1d955c5b7c1ead044ea49086b3479841 Change-Id: I78354a0f1d955c5b7c1ead044ea49086b3479841 (cherry picked from commit e1f392d171)
e1f392d171
df2c78d226
c34ef6d2df
8aac56ee8f
44e9c3609c