Merge "Added an event before clearning user journey" into rvc-dev am: 15f86c346a am: 0b3e045a36

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

Change-Id: Ia7cf2765db0f90d6d7b118d6030ed33bfe518d6a