Merge "SF: add vsyncId to SurfaceFlinger::composite trace" into tm-dev am: 10839214ab

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

Change-Id: I7a4df21952b36f1b653f44b9a6d1fe66de598d06