Merge "Cleanup commit to remove @SkipPresubmit and fix nits" am: 81ede794c7

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

Change-Id: I9816ee225b2c647a3127e5a4647722e366c0ddf8