Revert 1d6dd2c..5f5aac3

This rolls back to commit 1d6dd2c2d4f375abf03bdfcb8eab433b7bc33374.
Merge branch 'AOSCP-4.4.2' of https://github.com/AOSCP/platform_frameworks_base into AOSCP-4.4.2

Conflicts:
	.gitignore
	services/java/com/android/server/power/PowerManagerService.java