Merge "Added an event before clearning user journey" into rvc-dev am:...

Merge "Added an event before clearning user journey" into rvc-dev am: 15f86c34 am: 0b3e045a am: ec627b65

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

Change-Id: I4802a0c3ea751f2cae93dce1b6fcc729b92e394d