Merge "Revert "Un-expose ACTION_SERVICE_PROVIDERS_UPDATED."" into rvc-dev