Merge "Mark instrument events of FrameTracker in the trace" into tm-dev am: 332cf2b6d4 am: 8a9b77031d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17077331 Change-Id: I484688a6bb7f8da3c016dfa8566733380a376b0d
This commit is contained in: