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

Change-Id: I426a6ab01081887fa79193e6ee48288f79b2c74b