am 57d431e9: am 1450d5ca: account manager api review changes

Merge commit '57d431e928fbf9419fc7b0d87c34aa8472ae0d11' into eclair-mr2-plus-aosp

* commit '57d431e928fbf9419fc7b0d87c34aa8472ae0d11':
  account manager api review changes