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

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

Change-Id: I3d3df2d66922d9ab6275c9efd161eaafe8c795cb