Merge "Remove HWC trace from default surface traces." into rvc-dev am:...

    std::condition_variable mCanStartTrace;

    std::condition_variable mCanStartTrace;

    std::mutex& mSfLock;

    std::mutex& mSfLock;

    uint32_t mTraceFlags GUARDED_BY(mSfLock) = TRACE_ALL;

    uint32_t mTraceFlags GUARDED_BY(mSfLock) = TRACE_CRITICAL | TRACE_INPUT;

    const char* mWhere GUARDED_BY(mSfLock) = "";

    const char* mWhere GUARDED_BY(mSfLock) = "";

    mutable std::mutex mTraceLock;

    mutable std::mutex mTraceLock;