Always unbind before rebinding service

Bug: 128474150
Test: Manual
Change-Id: I3af252f3e34976976efd65628326bce49758184c
1 file changed