Use actual storage type for format message strings

Change-Id: I214120303bf6c12c297332fa314ce80bc686da46

Conflicts:

	core/res/res/values/cm_strings.xml
reconcile RemoteDisplayTile w/ cm

Change-Id: I4ea165afa140d421c52e54342d27490e5e598bb3