Return: Smart Pulldown [2/2]

Change-Id: Iba759e421b8cbb02fadaa6540aae7b7a74764293
Settings: Add proximity wake option

Ports and combines:

http://review.cyanogenmod.org/#/c/66658/
Settings : Add preference for proximity wake

http://review.cyanogenmod.org/#/c/69347/
Proximity Wake-Up : adjust strings

http://review.cyanogenmod.org/#/c/69803/
Settings : Make proximity opt-in

Change-Id: Iea0853eccf764438c7aaac76afd13c364fcea0ec
bluetooth: Don't crash when the local adapter is not set

In devices where bluetooth is not working (like the emulator or devices
in development), the bluetooth Settings crashes when closing the activity.

Most of the code checks for the nullability of the local adapter except
for this particular piece. This is usually not a worry for production
devices and I wouldn't usually worry about this but since the rest of the
code performs the nullability check it seems silly to crash onPause.

Change-Id: I7c1d3b43969b516336be770957008ef2054d312f
Merge "bluetooth: Don't crash when the local adapter is not set" into lp5.0
Merge "Settings: Add proximity wake option" into lp5.0
Setttings: Finish activity on AppOpsDetails if user press the back button

...in the action bar.

Change-Id: I9443d2396b3564221993930eb56f5edea84d7d2e
Merge remote-tracking branch 'slimroms/lp5.0' into lp5.0