Merge "Fix incorrect transaction id of Transaction#apply call stack debugging" into main am: 9e493bedb2 am: b07933ee16

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

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