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

Change-Id: Ibb956238a3296a5971aa5fb47880a0a41939b2ae