Merge "Fix CtsNetTestCases for secondary_user_on_secondary_display" into main am: df55e35227 am: 2a9810dd8a

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

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