Merge "Transition to appropriate state after all left addresses have been...

Merge "Transition to appropriate state after all left addresses have been cleared." am: 220d4600 am: 3e3f300b am: 2cea7699 am: 8a2792ff

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1335524

Change-Id: Ic16f69980d88c10f54b0d358e4eb8c770b05e163