Merge "Revert^2 "Use boot_clock for BuildVendorUsbDataSessionEvent"" into main