Merge "Initial changes to update winscope to read sysui/launcher protos"