Merge "Rename destroyAndAwaitReplacement to unregisterAfterReplacement." am: 544226f701 am: 8aa16fbf04 am: 6891f27e1a

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

Change-Id: Ie524f79114e08f6900cc420dbe8fb1f88861d1a3