Use actual storage type of sdcard/usb (2/2).

Currently, storage volume description for mount/unmount/format determined at
build time using PRODUCT_CHARACTERISTICS. For device which has only a sdcard or
only support usb storage, displayed description is correct. For device which has
both storage, the displayed description is totally wrong.

Use of actual storage type at runtime can eliminate the needed to specify
product characteristics, either default or nosdcard.

Change-Id: I9f8d53a4648d960f1009b1fe94787eecd4343427

Patchset: 6
http://review.cyanogenmod.org/#/c/63736/

Conflicts:
	res/values/cm_strings.xml
Build V85
settings: Cleanup and add auto power profiles option

 * Add categories for all items
 * Add helper class for Settings.Secure

Change-Id: I9d8fd6720516e7fa321c05744ada81415cbf8aaa

Conflicts:
	res/values/cm_strings.xml
Build 3/strings fix

Change-Id: I5a980790f14328e89f2088c1c15541eaf9396d35