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

* commit '518c0afaea02f9a680f6912bde2d73b0357236ca':
  Fix for the toggle airplane mode hidden API