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

Change-Id: I0086089943a6d11837d86fb46fe773ccb3955906