ProximityWake : Add support for checking proximity when waking device

Change-Id: Ia5ff446d88435773acccc7467e66009000dc20cb

Be sure to shutdown the proximity sensor after display wake

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

Change-Id: I1768f13cb48c3e056d0e137642690fc3d650c4ab

PowerManager : Make proximity check opt-in

Change-Id: I7cf64a82530da2e655018e43683ba7a5584d54f8

Framework : Fix proximity wakeup reference

Change-Id: Ia40ca6fbf6e37fbb3996f2384f725c30b88c2131
Revert "SystemUI: Fix mobile data connection type hiding"

This reverts commit b2aac59c634158f0e3d78f41d36b89c5ab3bbfe2.

This is intentional and is only displayed when 2 connections
are connected at the same time.

E.g.  If you're connected to Wi-Fi with a captive portal, then
3G will remain connected and normal data connectivity will go
through 3G until you have logged in via Wi-Fi.

In that case, the correct display is Wi-Fi with "!" and mobile
with "3G".

Change-Id: I985c361a656d15b145e467542508dcef41f92df5