PowerManager : Make proximity check opt-in

Change-Id: I7cf64a82530da2e655018e43683ba7a5584d54f8
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0