Merge "Added an event before clearning user journey" into rvc-dev am: 15f86c346a am: 94517f6578 am: a4891c01f6 am: fb0bc8f9df

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11812814

Change-Id: I47a9fff77509c421a4fb6390b6df88acd80a6be7