Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" am: a0360e38 am: cb6beee2 am: dbaabf76 Change-Id: I682e7c74c5f5e48ccb3bedbf34a2bdcf85e51c30