Unable to raise the SystemAPIs from the new place so moving it back.

Bug: 289203818
Test: atest CtsPackageWatchdogTestCases
Change-Id: Ia79f349c1e6addb083b0b5c7cac0276922d7c5db