Ensure prediction can remove from RESTRICTED timeout.

Prediction is supposed to be able to remove an app from the RESTRICTED
bucket if the app timed out into the bucket (but not for any other
reason). We were accidentally preventing that from happening. This also
fixes the test that wasn't asserting the behavior >.<

Bug: 151641467
Test: atest FrameworksServicesTests:AppIdleHistoryTests
Test: atest FrameworksServicesTests:AppStandbyControllerTests
Change-Id: I684c0bde586ed94e36e49bb47c8bd5cb9de1d664