Merge "Fix condition to check if FRP is active in LockSettingsService" into main