Merge "ActivityManagerService: Add an overall stack dumping timeout." into oc-dev