[1/2] Frameworks: Doze (ambient display) timeout

Change-Id: I0eb230020da9a306e089b58db9d48b18c9743c0f

Conflicts:

	core/java/android/provider/Settings.java