am 3a1204f7: am 6078d450: Merge "b/2630339 Fixed the crash when an app requests BT to be enabled" into froyo

Merge commit '3a1204f7cd231ed1c451ca90901eae082541b9ef' into kraken

* commit '3a1204f7cd231ed1c451ca90901eae082541b9ef':
  b/2630339 Fixed the crash when an app requests BT to be enabled