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

Change-Id: I71be5971e7b43a872a2ddb3661c502e92c58d4bb