[automerger skipped] Fix to support secondary_user_on_secondary_display on ConnectivityManagerTest am: 824751e305 -s ours

am skip reason: Merged-In I58370c7973a6bc5e362c50959e6e942fcb4c2ffd with SHA-1 cc2e9cb52e is already in history

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

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