Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" into oc-dev am: 0015a15353
am: f3c310e853

Change-Id: I8d145d23dd17cc07f0f9d89af718dafa1c3a3191