[2/2] Settings: added time since unplug filter for wakelocks

Conflicts:
	AndroidManifest.xml

Change-Id: I2944bb1b5d3e1b154103c834410b143c52164b8e