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

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

Change-Id: Ib6fdf1e59ea84a226193f09c0c6de26577dec523