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

* commit '05e7e3450006438311b18d6b0be920ad5579782a':
  Fix for the toggle airplane mode hidden API