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

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

Change-Id: Ia892c875c638dccebc3960c8e97acd2b70af7c6c