Merge "Remove extend touchable region for AOSP keyboard" am: ff1db79a18 am: b1dec95c37
am: 61722df601

Change-Id: Id85f0a065268605297ed4e25c84d74745f533d36