Fix AirplaneEnabler bugs

AOSP Bug 7132230