Merge "Catch double unbind of dead service"
am: 03cdc95f1c

Change-Id: I9ff4cb306e807d769a1dd5acca06a2703b666040