am 518c0afa: Merge "Fix for the toggle airplane mode hidden API" into klp-dev am: 3a2617c02d

Original change: undetermined

Change-Id: I50446d2a4c5feb96e4f7276e026df1a7eba56105