Merge "Only unbind Mtp service during disconnect or disable"
am: b20a947f42

Change-Id: I0b385d033f23dcf205449e9fef763b9b8e83fe59