Add compatibility code with mainline's configuration options for unlock

Change-Id: Ife2d6fad5cb1e7c846f5969401ee6dbc881aea3f
Suspend Actions (3/3)

Change-Id: I4a763458ab0ef52d9ff778d1c7ba24af2f5100c6

Conflicts:
	src/com/android/phone/PhoneInterfaceManager.java
[2/3] Telephony: allow disabling non intrusive incall ui

Change-Id: I54c07211dc121117543ccb8a4799efa491e5a469