Remove ril.radio.disabled from setup, add disabled False into test_settings_airplane_mode teardown
Merge remote-tracking branch 'upstream/master' into rem_ril_radio
Update test_settings_airplane_mode wait string
Merge pull request #739 from zacc/rem_ril_radio

Set ril.radio.disabled False if True