Merge "Radio is not turned on after turn off airplane mode in safe mode"
am: 48073e2beb

Change-Id: I84b966a884bd7e06573f608a1da81a0d3234df5e