Merge "Rename destroyAndAwaitReplacement to unregisterAfterReplacement." am: 544226f701

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

Change-Id: I982fef6b0a05c791292c5e0ce9e28ff0130d3a94