Añadido accesos para LMT y Viper4Android
[2/3]TeloRadio packages_apps_Settings
	* Lista de configuracion
		> Enable manager
		> Use LTE
		> 2G with Wi-Fi
		> 2G with screen off
		> 3G to unlock

Conflicts:
	AndroidManifest.xml
	res/values-es/tk_strings.xml
	res/values/tk_arrays.xml
	res/values/tk_strings.xml
Settings: Allow choice of screen-off animation (2/2)

Adds a choice of alternative screen-off animations:

- Fade out
- Electron beam (default)
- Scale down

Change-Id: I50e7c1d5989cc6004cf635af11e0f775cdd21f0c
Conflicts:
	res/values/pa_arrays.xml
	res/values/pa_strings.xml