am c34c79fc: am cf229bb0: make consistent with new RegisteredServicesCache API

Merge commit 'c34c79fc6627329f1c9586d51524d95d57022aaf' into eclair-mr2-plus-aosp

* commit 'c34c79fc6627329f1c9586d51524d95d57022aaf':
  make consistent with new RegisteredServicesCache API