automatic translation import

Change-Id: Ie0ed38c63163824278992db0a0eb79f821de9398
ShutdownThread: set soft reboot trigger accordingly

Change-Id: I72bd52aa1492d356e368e8c60897002c1f110172
ProximityWake : Add support for checking proximity when waking device

Change-Id: I87090d4e9b79913a04c99c6e133af2b71e79a89c
Framework : Fix proximity wakeup reference

Change-Id: I42504aba0ecfcd4c1bb9cc2b7b770d8870d69d94
Be sure to shutdown the proximity sensor after display wake

This fixes:
http://review.cyanogenmod.org/#/c/66657/

Change-Id: I1768f13cb48c3e056d0e137642690fc3d650c4ab
Proximity : Check proximity flags only if from native

Change-Id: Id1be619e638de6a45252d8390eab6e38bd5de5a7
PowerManager : Make proximity check opt-in

Change-Id: I7cf64a82530da2e655018e43683ba7a5584d54f8
Merge remote-tracking branch 'upstream/android-4.4' into android-4.4

Solved conflicts:
	services/java/com/android/server/power/ShutdownThread.java