Merge "Add missing @Retention annotation for CustomTabsService.Result" into nyc-support-25.2-dev