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: ce647a5e am: ebed14c3 am: 4f2309ff

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



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