Fix duplicate bubbles in the overflow

* If something was added to the overflow that was already there
  make sure to remove it from the list first
* Did this in data & in update adapter to be safe

Bug: 181890793
Test: atest BubbleDataTest
Change-Id: I2a576911e0f3791768536f4a866d7174f55a0a2d