Merge "Port: Don't show phone unlock targets for devices without voice (1/2)" into cm-11.0
Conflicts:
	packages/SettingsProvider/res/values/defaults.xml