Merge "Fix to support secondary_user_on_secondary_display on ConnectivityManagerTest" into main