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

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



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