[automerger skipped] Merge history of ConnectivityT am: 31bb94f3bc am: 7982423d0b -s ours

am skip reason: Merged-In I87843d554d1e726158f8784aa2ec61c92867ad3e with SHA-1 36331e0aa9 is already in history

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

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