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

Change-Id: Ia80991a7e8b961cf90002661c7a49a9002566786