Merge "BluetoothManagerService: catch NoSuchElementException for unlinkToDeath" am: 6227b441a0 am: 082be76cd4
am: 4e0b70bd6f

Change-Id: I88247eb54f37f76e828cfba21709ceb0a2ebfba7