Merge "Remove InputMethodManagerDelegate#getLockObject()"