Fix bug in airplane mode.

If the phone comes up in airplane mode you and you turn it off,
you can currently end with both mobile and wifi turned on.

bug:2524413
Change-Id: I7a841c955be9038109d0b220070406a3fbd3e8e9