Avoid NPE if icon assignment failed for whatever reason.

Change-Id: Iba4188d6b42179008154b8cbcbb14c36a22669de
Settings: grammer fix in config.xml

Change-Id: If7e7f8fa2292c10a74daac64d7875fbbe993db48
PBAP: Fix device name update on authorization prompt from Notification.

Use FLAG_ONE_SHOT for Notification PendingIntent to launch
authorization prompt and display the updated device name for
every new PBAP connection request.

Change-Id: Ic9cbed92e2856ed2d2f4f807f7f8c39df7f98762
CRs-fixed: 515221
Bluetooth : Remove out of range devices after ScanComplete

Change to remove device from UI when Bluetooth of remote
device is off or not discoverable anymore. Without this
change a device that discovered previously is available
in available devices list always, though the remote device
is not discoverable anymore. The current change updates
available devices list on scan complete removing the
devices that are available in cached devices and are not
disvorable anymore.

Change-Id: I97809fcafd904271121e26741e50a9b61f0e0664
Fix coding style.

Change-Id: I520b16f1c9a927a93d9e1bd4f7e712769d341e58
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_packages_apps_Settings into cm-10.2