Merge "ActivityManager: Fix slow-app ANR dumping" am: 923208e8c9 am: 2d47ac0df7
am: 1c015160c6

Change-Id: Id3bd33caa4137b36b7ead74689bf2c0aaa09e3d4