Add lockscreen rotate and custom locksceen text color.

Conflicts:
	core/java/android/provider/Settings.java