[automerger skipped] Un-expose ACTION_SERVICE_PROVIDERS_UPDATED. am: 6b2eddec am: 8798cc6c -s ours
am skip reason: Change-Id Iab4974f9cd7cecde1ef6eba35c320101a288b481 with SHA-1 13a8d14f is in history
Change-Id: I92dcd75ce0edf7bcaa8f0f3e50c7a3e92a43f98f