Merge "Remove IInputMethod.attachToken(IBinder) from greylist"