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

Change-Id: I08a3267b202289bd7db9f5926ba167b0d57eb82a