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

Change-Id: Idcb25f3021e81010eb6c5e3b940ca8b654155bad