Merge "No-op cleanup" am: 21592b0d93 am: 866b9c4480 am: fa45b598d5

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

Change-Id: Id826a9b4659d9d10d7477e107c3cf640322f484c