Add compatibility code with mainline's configuration options for unlock

Change-Id: Ife2d6fad5cb1e7c846f5969401ee6dbc881aea3f
Telephony: Fix network selection array

CAF added more options to this array but all languages still use the AOSP arrays.
Copy the array to cm_arrays.xml (similar to the way we used for app ops).

PS1: Simply copy original array
PS2: Move additional items to cm_strings
PS3: Move all items to cm_strings & mark untranslatables

Change-Id: If6c22a59cf1021bf997d24855f685e00edf37f03
Merge "Telephony: Fix network selection array" into cm-11.0
Add People Lookup settings

Change-Id: I8c5fee12af9a66e5a6a80ae06e0ce961ecbbd60e
Merge remote-tracking branch 'cm/cm-11.0' into kk-new

Conflicts:
	res/values/cm_strings.xml