Merge "Fix up some IME stuff with the setForwardedInsets work around" into...
Merge "Fix up some IME stuff with the setForwardedInsets work around" into rvc-dev am: 52a8fc73 am: 20ae658a am: 9217545e
Change-Id: I7d4090b64881b631ce98c2adba8ca8fd6544c9f3