Merge "Temporarily disable RAT/signalStrength based auto data switch" into main