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

Change-Id: I38ac4a840430e6e33e4574cdacac20bc06687545