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