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

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

Change-Id: I37b1180cd9abb3fdd391c51b41d50745a3e38368