Amend earlier fix for hold failures

Check the bgState condition last during a hold failure so that we
actually get to the case where the call waiting call is present is
actually considered.

Test: manual
Fixes: 128275255
Change-Id: Ia38adee3cacb154f21ef3ca95eb18c33ae1279be