Merge "Improvements to ActivityManagerService stack dumping" am: 2529f65e87
am: 9e9270ee3d

Change-Id: I273b307256c3bf6d2255a7c092c4985c90d26942