Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" am: a0360e38ab
am: cb6beee2af

Change-Id: I534817c867b9dbd045a491dddcbf8190e299d972