Merge "BluetoothManagerService: catch NoSuchElementException for unlinkToDeath"
am: 6227b441a0

Change-Id: Ibc7628614537aea1dc8996200f6eb272f758f8a7