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

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

Change-Id: I77641c675e2ee62c4f3e7ab299c8e2d20ab059e7