Fix tests after mid-air collision

One commit (96ccee36) meant that a new method is called
during tests.
Another commit (37df60b0) meant that unaccounted-for
methods cause errors.

Both changes were tested independently, but together
they cause a test break.

Test can be run with:
atest FrameworksTelephonyTests:NitzStateMachineTest

Bug: 63743683
Test: See above
Change-Id: Ie53510402ee56c56e90095dc540a1c59f14e62be