Merge "Revert "AndroidInputEvent: Migrate from TracePacket to WinscopeE..."" into main