[1/3] TeloRadio frameworks_base
	* Defines preferences

Conflicts:
	core/java/android/provider/Settings.java
Framework: Allow choice of screen-off animation (1/2)

Adds a choice of alternative screen-off animations:

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

Change-Id: I8ec9bfc6248a1223037fd252b0c853db7994afe6

Conflicts:
	services/java/com/android/server/power/DisplayPowerController.java