Merge \"Don\'t dump stack traces for background ANRs.\" into nyc-dev
am: b2b203ae13

Change-Id: Iea2c941636c829b687470244cff22a03ea51d9f7