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

Change-Id: I48c163e11a378d4d1275d25f08eaeb4d7e5d8356