Merge "Revert tab key behavior on multiline EditTexts." into rvc-dev am: 4d857ccce5 am: 2980d35ee8

Change-Id: I5611dd8029c1a1bd13cdfb02b241488f563cf529