Camera: add additional ISO modes (1/2) - CM

Change-Id: I15483b24b356acea3f1f5bece63f806dd7383dbc

Conflicts:
	res/values/strings.xml