Revert "Add option for switching between UMS and MTP/PTP mode. (2/2)"

This reverts commit 5fb4d8f9ea011c7c1e43e1cd3532a84ff832da65.
Enforcement control for READ_EXTERNAL permission.

Surface enforcement controls for READ_EXTERNAL_STORAGE permission
using new PackageManager API.

Bug: 6131916
Change-Id: I0ece4742666fda58e41410cb4b0b7175f280fa31
Handle READ_EXTERNAL enforced by default.

Bug: 6131916
Change-Id: Icbdaf6c7febfb8f93992a1f32732d104c8c1848c
Don't let monkeys launch storage management activities.

Guard against monkeys in two places where intents to other activities are
launched.

Bug: 5415988
Change-Id: Ia3c5514c02423f7b249f655296bb02e279789dfd
Enforce READ_EXTERNAL in Developer Options.

Move from Storage to Developer Options, and add interstitial dialog
with more details.

Bug: 6461446
Change-Id: I6d3d8fdc61a3e920ed58ab4d726949ac3c31feab

Conflicts:
	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java
Add option for switching between UMS and MTP/PTP mode. (2/2)

This adds support for switching between UMS and MTP/PTP.
Settings part (this part) adds option in USB settings (statusbar/notification drawer) for enabling UMS,
and adds setting in Storage menu to enable / disable UMS, this since the USB settings page disappears when enabling UMS.

Conflicts:
	res/values/strings.xml