Merge pull request #16251 from Moz-TedC/master

Bug 965346 - Part 2: Update airplane mode status whenever _enabled flag ...
(cherry picked from commit b30742e845f603441942ed295fa5359d9704b20a)