[automerger skipped] Merge "Fix Transaction tracking for FrameTimeline" into sc-dev am: ca344844 -s ours

am skip reason: Change-Id Id3b8369ca206f8b89be3041e5fc018f1f1be1d23 with SHA-1 97cb066a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib39cc7bc084430183e0a926241535795faf01c2c