Camera: add additional ISO modes (2/2)

Change-Id: I3460c3de4cbef467430673146a9ddb2fdc8f5032

Conflicts:
	core/java/android/hardware/Camera.java