Merge "Bluetooth and NFC added back to Connection preferences" into pi-dev
am: 273faa216e

Change-Id: I01c054196b04b66677708711be0d298ef2c24041