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

Change-Id: I3604cc1238704632b9f5061c58d2dd43f5d95a9a