am 7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1

* commit '7ad85eb62f9f332cc8002ec996cd359333ba590e':
  Persist wifi override in airplane mode