am 5865825d: Merge change Iabe9529e into eclair

Merge commit '5865825df6792f1cf6a5f70911f5ad15a2a243b8' into eclair-plus-aosp

* commit '5865825df6792f1cf6a5f70911f5ad15a2a243b8':
  Adding ContactManager sample to SDK samples.