Merge "Merge "Revert "Un-expose ACTION_SERVICE_PROVIDERS_UPDATED."" into rvc-dev am: 26d48541 am: 6f7f7c71" into rvc-d1-dev-plus-aosp