packages: settings: CryptKeeper: Disable FDE if PFE activated

Don't allow Full-Disk-Encryption (FDE) after Per-File-Encryption (PFE)

Change-Id: I5ed46d4362f6536a6cf526aa5bf4bac4610c47b6
Settings: fix a couple of multiuser bugs

- show interface settings
- hide media scan on boot behaviour
- show privacy guard

for other users

Change-Id: I2b488f69b820f289d7ddb04e5171637b355dc5cf

Conflicts:
	src/com/android/settings/SettingsActivity.java
Return: Smart Pulldown [2/2]

Change-Id: Iba759e421b8cbb02fadaa6540aae7b7a74764293

Conflicts:
	res/values/screwd_strings.xml
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

Conflicts:
	src/com/android/settings/DisplaySettings.java
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