[automerger skipped] Merge "Catch double unbind of dead service" into pi-dev
am: 6c2af1afa2  -s ours

Change-Id: I6eab8580911b7c84f21f4457d7fe3554110dd67e