Merge "Add handling of RADIO_NOT_AVAILABLE in TimeConsumingPreferenceActivity" into lmp-mr1-wfc-dev