am 8bd04b20: Merge change Iea48361d into eclair

Merge commit '8bd04b2000f418c8c6f4f628abc215bb5a688244' into eclair-plus-aosp

* commit '8bd04b2000f418c8c6f4f628abc215bb5a688244':
  fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug 2171204