RC - LocalDB: Fix the tracking of the observation windows

This fix an issue causing the observation windows to not be persisted
across sessions. There's a logic bug in the code responsible of merging
the current observation with the one from the database.

Bug: 773382
Change-Id: I92c7937413365a5f45fbdbda697380d86af60215
Reviewed-on: https://chromium-review.googlesource.com/1143708
Reviewed-by: Chris Hamilton <chrisha@chromium.org>
Commit-Queue: S├ębastien Marchand <sebmarchand@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576566}
2 files changed