Merge "Include BLE<->SPP transition states in isLeEnabled" am: ac413db400
am: 6006a30059

Change-Id: I32779d316e1823c010b70e27a962f66cf6a5b112