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