Merge "Bluetooth: deal with framework going away." am: 09e49b0871
am: a936e673d0

Change-Id: Id6134dd11869978d2f2f485ba3758873c47098dc