Merge "Enable secondary_user_on_secondary_display for CtsNetTestCasesUpdateStatsPermission" into main