Merge "Add ANR info to traces for all builds" into tm-dev am: a2b0efdc am:...

Merge "Add ANR info to traces for all builds" into tm-dev am: a2b0efdc am: be436461 am: 11138c3b am: 0b52c1da

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18870966



Change-Id: I39dd94826b1133121c36ae5c30f7fd1a3f813eb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>