[automerger skipped] Merge "Renew previous IP address when roaming happens in...

[automerger skipped] Merge "Renew previous IP address when roaming happens in certain specific Wi-Fi networks." into rvc-dev am: b3069585 am: cf58a10d am: 2754e61e am: 07a8a21a -s ours

am skip reason: Change-Id I65ebdd142a2bb402035c63cd282bc2574ddf3d8d with SHA-1 39cd852a is in history

Change-Id: I51da3d6a231e01c63c4c05a0c56ebd6cc3ef43fb