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

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

Change-Id: I281a9289f53f1853b2148ab295e392cc4a21cde1