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

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

Change-Id: I1ccbfd2c65b82836d3abf79d370781bbdfd28b0f