[automerger skipped] Cleanup commit to remove @SkipPresubmit and fix nits am: 74ded77039 -s ours am: bdde058c66 -s ours

am skip reason: Merged-In Idde90ce5e4fc6f56ad617d5ba9735b1bcc2ce8cd with SHA-1 a42e8215d8 is already in history

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

Change-Id: Idfdf8374c1a438c58afaee40426bcc2a321e8e6e