Fix "About Phone" crash

again.

Change-Id: I25293372b9b8f92be3e95639a6f2a9512d00143a

Conflicts:
	src/com/android/settings/DeviceInfoSettings.java