DO NOT MERGE: Downbranch merge conflict [Output Switcher] Log new events

Test: N/A
Bug: 223486955
Change-Id: I3157aec71e70032d4dd3a1ac063ee6cb5d7d921f
2 files changed