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

Change-Id: I15a67ad7b277b345b96f2a7cf852554ed6fee267