Merge "No-op cleanup" am: 21592b0d93

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

Change-Id: I4ea2b3bd3ab5f8c58aca5ca602e22a67f6f8e0d1