am a7719af3: Merge change 26217 into eclair

Merge commit 'a7719af31290bea50d822b535b6a886ba7a88097' into eclair-plus-aosp

* commit 'a7719af31290bea50d822b535b6a886ba7a88097':
  Cache the remote device's service channel.