Allow earlier ServiceWatcher rebindings

Under error conditions (for example if the bound service returns a null
binder), ServiceWatcher will not retry until the chosen service changes.
This allows retrying the binding whenever something changes and the
binding is not currently connected.

Test: manual
Change-Id: Ifc2187e4930120d629c0f5f8148c88b1c2561a35