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

Change-Id: I0a28c5d0f1add81ad3d0c1803340c98c096a20a5