Cleanup

Change-Id: I3f7dda4caff1af498b60efd6ac47a273d06b0e36

Conflicts:
	core/java/android/provider/Settings.java
Frameworks: Lockscreen Rotation Optional (1/2)

PS2: Change method to allow disable, enable
	portrait, landscape rotation.

PS3: Just clean up...same code.  Different
	style.

Change-Id: I164d31b8980562eb5df68dcb2846410d932a4e73