Use actual storage type for format message strings

Change-Id: I214120303bf6c12c297332fa314ce80bc686da46

Conflicts:
	core/res/res/values/cm_strings.xml
Add string resource for UICC storage

This will add one more string resource for the devices
which has UICC support in settings->storage option.

Change-Id: I19a5813749f51aec841769aa8d21792716d033a7