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

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

Change-Id: I221b68852459536621c49867c67aea9a8a67f7d9