Merge "Update airplane mode key to match framework constant" into pi-dev
am: 6be5e331cf

Change-Id: Ifb10ad7d2dd23359dab8ee1307751a0b49082cbb