am c678a93a: Fix issue #2056585: applications can put phone in inconsistent state wrt airplane mode

Merge commit 'c678a93a73c83e841032874bee9c202936da73c0' into eclair

* commit 'c678a93a73c83e841032874bee9c202936da73c0':
  Fix issue #2056585: applications can put phone in inconsistent state wrt airplane mode