[automerger skipped] Merge "Clear IPv4 address on tethering teardown." am: 86e94acfa4
am: 877328afa9  -s ours

Change-Id: If86894bf2ee14217b9d58da99b90f0909ce59a10