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

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

Change-Id: I0b8a7fcd7dd3e7bf35e30ef5615e80e2bd5478ae