[automerger skipped] Merge "Add AIDL HAL stack traces to bug-reports" am: 9d042f8ee4 am: 3dd751dd63 -s ours

am skip reason: Merged-In I1e087600ac764191a91eb9b1f11e51f21bce19e3 with SHA-1 ddd3da0d8f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128560

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