am a41e0680: Merge change I36785a9d into eclair-mr2

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

* commit 'a41e068045dabe510aa36fa829acf693f6c9cae1':
  Telephony: Make resetting radio on a radio technology change optional