Merge "Enable AdExtServicesFrameworkUnitTests on R and fix failing tests" into udc-mainline-prod