Revert "Allow USB notification to show when primary SD allows UMS and MTP"

This reverts commit 40e0779cd1ba75076ea2d7a999d70b28b41232be.
Revert "Add option for switching between UMS and MTP/PTP mode. (1/2)"

This reverts commit 92724e9962341b47fa4e5aeb8fdf3c4c80c86415.
Allow USB notification to show when primary SD allows UMS and MTP

Previously if primary SD is set to allowMassStorage="true" the USB
dialog would never show.  This checks if persist.sys.usb.config is
set to mtp,adb and then allows the USB notification to show. With
this you can then have the option to select from MTP, PTP and Mass
storage when clicking the pull down notification. When Mass Storage
is selected it activates the USB connected dialog to turn on USB
storage. When set back to MTP the USB connected notification disappears.

Change-Id: I2287075ec93cae75f19e8fb59965d9dddb234aca

Conflicts:

	services/java/com/android/server/usb/UsbDeviceManager.java