Add a 5 minute timeout for cpu hogs

Change-Id: I63cb727c86c37b50914d6ee303eea8ad3d999f51
Merge "Add a 5 minute timeout for cpu hogs"