Support the signed-builds FOTA updater, too

Change-Id: I2724881d6252ce7ce17ed9b3cfa94f6fecae1f7d
Revert "Bluetooth: disable scan icon when BT state is off"

This reverts commit 214b5d2a8c134ec9f310c7132b06d04748e154f3.
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

Conflicts:
	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.java