Merge "BluetoothManagerService: catch NoSuchElementException for unlinkToDeath" into pi-dev am: f69dfb9b2f
am: f5c5d263a1

Change-Id: If94409ab204579d117be9dd4adc3fd1005ed4b83