Merge "Merge "Add new atoms to track user journeys, such as user switches."...
Merge "Merge "Add new atoms to track user journeys, such as user switches." into rvc-dev am: 58df2202 am: 5bd5e961 am: d39cd3a6 am: d65c51de" into rvc-qpr-dev-plus-aosp am: 53e0eab9
Change-Id: I809ea8afa7bb890e3ada7b8bf5afabc59d3ec6aa