Merge "Avoid WiFi to Cellular silent redial when roaming"
am: 8fd48568d5

Change-Id: I9d0fe4981d0293864f2a066121587bbadc8a5705