Merge "Call #clearSettingsProvider in PowerManagerServiceTest" into rvc-dev