[automerger skipped] Merge "Include pid of ANRing process in perfetto traces"...

[automerger skipped] Merge "Include pid of ANRing process in perfetto traces" into udc-dev am: 0d800228 am: 950ee90b -s ours

am skip reason: Merged-In I4d666b37fed5a5d0015a39d13695ef7a5046fd59 with SHA-1 b0a2424f is already in history

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



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