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

Change-Id: Ia7be01980ae41c4f988f06263692ec95678e7c4e