This reverts commit 167538021b.
Reason for revert: Reland the CL
- Extend the timeout period for low-end devices.
We should also allow the activity to be recreated in ON_START state,
since ON_START is also a resting state and we don't see a reason to
prevent applications from doing so.
Bug: 162906202
Test: atest FrameworksMockingCoreTests
atest FrameworksCoreTests
atest WmTests
Change-Id: Idb17514619c6501474f7fc6844dda9da98a4dd72
849b6933ea