[automerger skipped] Merge history of ConnectivityT am: 700ffc994f -s ours am: def659a25a -s ours

am skip reason: Merged-In I67c703e3f7aa9d5787f032a79ed62e45412baf4f with SHA-1 41f94ec8a1 is already in history

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

Change-Id: I78d7150a1eaa7b92836407d2a33ec505c45c6cc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>