Merge "Enable secondary_user_on_secondary_display for CtsNetApi23TestCases" into main