DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising...

DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."

This is cherry pick from master/klp-dev changes.
This reverts commit eb56b9ccb8fa70a6c567d0bcd02f821e4de4bf7b.

Conflicts:
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java

Change-Id: I2ce6b9eb0e335ba1b9aa4e1cb61a041f00d9aa87

Conflicts:
	src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java