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

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

Change-Id: I9d7fde300746806bd576e8f96d51c80e34234dd4