[WindowDecor2] Fix logic for setting spy/force-consumption params

A subtle change that joined two nested |if| statements together changed
the execution flow during relayout param calculation, this change
reverts to the original logic from window decor 1.

Specifically, isTransparentCaptionBarAppearance=true +
enable_accessible_custom_headers=true +
enable_caption_compat_inset_force_consumtion=true should NOT set
params.mShouldSetAppBounds nor FLAG_FORCE_CONSUMING, but wd2 would set
one of the two.

Flag: com.android.window.flags.enable_window_decoration_refactor
Bug: 409648813
Bug: 414521306
Test: atest WMShellUnitTests
Change-Id: I966cfbf8048e17469c82868b28143b73fae382a3