Settings: Better management of long press screen timeout tile to stay awake (2/2)

Change-Id: I6df3ebfd76ac2a6dfac838681af6d09e6def0f58

Conflicts:
	src/com/android/settings/DisplaySettings.java