FGS stop log bug fix

Updating location of log to be before type is cleared. Also restricting
logging to cases where we have a UidState.

Adding in log lines for when there is no API type (since the FGS should
have a type)

Bug: 294585409
Test: manual testing on device along with unit testing
Change-Id: I6ca2a2a47dce3e0dad26263ff21aa43e3c00a07b
2 files changed