Merge "Enable secondary_user_on_secondary_display for CtsFsMgrTestCases" into main