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

Change-Id: I85c2e1d5734f82f425c3887f7f56085399fb7897