If TimeoutException occurred, we don't know whether mService.addClient succeeded. We should call mService.removeClient() to make service to unregister the client if exists and reset the mServiceClient. Bug: 156044027 Test: atest CtsAutoFillServiceTestCases Test: Run adb shell dumpsys -T 60000 activity -v all to see log Change-Id: I10ce988603f47117d0efddcc014ec51b72d3b3b4