PowerManager : Make proximity check opt-in

Change-Id: I7cf64a82530da2e655018e43683ba7a5584d54f8
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_frameworks_base into android-4.4