[2/2] Settings: Wakelock Blocker

Change-Id: I1846438651dcf0939472610fcde8729280795177

Conflicts:

	res/xml/power_usage_summary.xml
Merge branch 'kitkat' of git://github.com/AOGP/android_packages_apps_Settings into kitkat