am 5b4b305b: account manager api review changes

Merge commit '5b4b305b9698526c6e82e0e01448b0a5642dd505' into eclair-plus-aosp

* commit '5b4b305b9698526c6e82e0e01448b0a5642dd505':
  account manager api review changes