am 5124afbc: am f31bb1af: Fix a race condition determining whether password fallback mode is allowed.

Merge commit '5124afbc66360234a6b9e9e4c50622fd3e0224e1' into eclair-mr2-plus-aosp

* commit '5124afbc66360234a6b9e9e4c50622fd3e0224e1':
  Fix a race condition determining whether password fallback mode is allowed.