Don't reset Z order if the expanded view is temporarily animated out.

This resulted in a full opacity SurfaceView hanging out behind the bubble scrim. This was not visible when we had an opaque scrim but now that it's transparent again we can see it.

Bug: 184198137
Test: manual
Change-Id: If768ccc9f6dab56764227cffdbbda4f8738d56cc