am 02d89898: am a2058e43: Merge change I11c3cdc7 into eclair

Merge commit '02d89898c9b48426d5add48868a640c198a3321f' into eclair-mr2-plus-aosp

* commit '02d89898c9b48426d5add48868a640c198a3321f':
  Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.