Settings: fix NPE with null check on NFC adapter

Verifies the adapter is not null before dereferencing it and log and error if so

Change-Id: Id2a34c4698a97476bee9b78cb0ac7b980d1595cf
Merge "Settings: fix NPE with null check on NFC adapter" into android-4.4
Revert "Settings: Remove System updates"

We're going to make use of this :)

This reverts commit 0cb067c101ba66fb0fc1408b906642f6ca4c96c9.

Change-Id: I29da9c36412c200383fb10bf2697042bffe5f5ee
Merge "Revert "Settings: Remove System updates"" into android-4.4
[1/2] Settings: interface settings restructering

Change-Id: I3de1cc9367deaa31baf6c2e86b8da7084ef788d1
Merge "[1/2] Settings: interface settings restructering" into android-4.4
[2/2]Settings: Option to hide Adb notification icon

Base: https://gerrit.omnirom.org/#/c/2934/

Change-Id: I3ac5f08a077e04dade4bdeed58442043a8fb5d23

Conflicts:

	res/values/custom_strings.xml
Port "Option to control cursor in text fields using volume keys (2/2)"

Change-Id: I20109c880ed3ac27783f825557f6830d83e3dd5d
Add LockClock to Settings menu

Change-Id: Ie9d10e7c8186354f01e29e1aaeb23b580ebd04aa
Revert "[2/3] Settings: Add ActiveDisplay options via OmniGears"

This reverts commit b9a18a85996044bf27698e95fffd21dcf37a7316.

Conflicts:

	AndroidManifest.xml
	res/xml/settings_headers.xml

Change-Id: I18fdeb6cc8b457f5b65dd97cec51c2608e04b244
Display options: allow configuration of wake on plug behavior (1/2)

From http://review.cyanogenmod.org/#/c/47159/

Change-Id: I601b3ccf35198d5cbda9971c693637f254b8db5d