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

Change-Id: If587449744f1eeb01a8ea6e20ce34dc6d85e124c