Bluetooth: Disable bluetooth only if BT Sevice is connected

Bluetooth service is imidiately disconnected from the adapter
after SSR OR if any bluetooth services is crashed OR framework
is crashed. As Bluetooth  service is not connected OR Bluetooth
is not enabled, So BT disable should be ignored & bluetooth
persist setting should not be changed.

CRs-Fixed: 499116

Change-Id: I19de939346d014cdf918e11711f2d6066e55d054
platform: Remove mapping of android.permission.CAMERA to camera group

This mapping introduces security risk where any app with android.
permission.CAMERA can open camera driver directly without going
through mediaserver.

CRs-Fixed: 448868
Change-Id: Ic16880cfac0bc85a3e753ccd3261bfc455b02d1a
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_frameworks_base into working