am ae0cf6dc: Merge change I50986dd4 into eclair

Merge commit 'ae0cf6dc9eb92282ef92b00ac68bfaca8aad2a1e' into eclair-plus-aosp

* commit 'ae0cf6dc9eb92282ef92b00ac68bfaca8aad2a1e':
  Make the RegisteredSErvices Cache not allow the registered service for a