Revert "[SettingsProvider] minor refactor before lock changes"

This reverts commit 21aa4abd.

Reason for revert: Potential culprit for b/307381985 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted

Change-Id: Ibbb1e14e5c5a5d82cadd80a54a754c178aceab05