Merge "Update network type when RadioInfo is resumed" into sc-qpr1-dev