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

void SurfaceFlinger::onComposerHalVsync(hal::HWDisplayId hwcDisplayId, int64_t timestamp,

                                        std::optional<hal::VsyncPeriodNanos> vsyncPeriod) {

    const std::string tracePeriod = [vsyncPeriod]() {

        if (ATRACE_ENABLED() && vsyncPeriod) {

            std::stringstream ss;

            ss << "(" << *vsyncPeriod << ")";

            return ss.str();

        }

        return std::string();

    }();

    ATRACE_FORMAT("onComposerHalVsync%s", tracePeriod.c_str());

    ATRACE_NAME(vsyncPeriod

                        ? ftl::Concat(__func__, ' ', hwcDisplayId, ' ', *vsyncPeriod, "ns").c_str()

                        : ftl::Concat(__func__, ' ', hwcDisplayId).c_str());

    Mutex::Autolock lock(mStateLock);