Merge "Change permissions checks for setAirplaneMode."
am: 3889ff53ed

Change-Id: I578923c3f9012055f715e536f5d4d42ed669c5ee