Merge "Use correct binding flags when reconnecting to IME" into oc-dev
am: 13df64aa8e

Change-Id: I95b199b5d06a66051367feb51aa8c578b7e29245