Add compatibility code with mainline's configuration options for unlock

Change-Id: Ife2d6fad5cb1e7c846f5969401ee6dbc881aea3f

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

Change-Id: Idea0455a156ceff754170038dc5b2f4fa1be4469
double derp
its been a long night

Change-Id: Ide3801f24bd13aa3eb8fee711146130b163afbb2