[Preferences] Make rebuild by ConfigurationBlocks compatible with
PreferenceSetService

Change-Id: I41ac7bf76f1eb319912ca28bdd307b92dbf668b7
5 files changed