am 0647b580: Merge change 25970 into eclair

Merge commit '0647b580aa7874311fc77b659e4f646750ddd74e' into eclair-plus-aosp

* commit '0647b580aa7874311fc77b659e4f646750ddd74e':
  Make removeBond() call async.