Add compatibility code with mainline's configuration options for unlock

Change-Id: Ife2d6fad5cb1e7c846f5969401ee6dbc881aea3f

Conflicts:
	res/values/config.xml
	src/com/android/phone/PhoneGlobals.java
cleaning

Change-Id: If59770e3c90534f7d0e361012ffcf364935f128c