Merge "No-op cleanup" am: e88bfbc015 am: 8a867d17a0

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

Change-Id: Ia33ef9b8b7f120491f78dfb825301a0b13611de5