Only collapse if the removed bubble matches the expanded bubble

- With task trampolines, it is possible for the second task to have been
  created and expanded before the first task finishes & triggers a
  removal, so we need to verify the task matches before attempting to
  collapse the wrong expanded bubble

Bug: 409394438
Flag: EXEMPT bugfix
Test: atest BubbleBarLayerViewTest
Change-Id: I0a6df231f1641ef3c89cc571c457214911563fe8