Merge "Lock down IInputMethodManger.{add,remove}Client()"