Merge "SF: Trace hal::HWDisplayId on hardware VSYNC" into udc-dev am: 7702161e

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



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