Update new onTimeout to be called for SHORT_SERVICE.

Add logic to call the new onTimeout callback for short fgs. The old
callback (without the fgs type) will still be called to maintain
compatibility.

Bug: 330399444
Test: atest CtsShortFgsTest
Change-Id: I14b29d6fc9564f24aa8f7d2c64a2e454880d5d10