Merge "[automerge] Add unit tests 2p: a3420707df 'Merged-In: <AOSP-18973920> Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/18973920"