[automerger skipped] Merge "Update airplane mode key to match framework constant" into pi-dev am: 6be5e331cf
am: 73ed33af27  -s ours

Change-Id: I2564e4d3938d9798588ea9ef98c7830e120c24e3