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

Change-Id: Ice2b8be7e19453c68e1432088887365b5085f617