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: de1e3dc8

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

Change-Id: Id55ccd5f9a75d29527d8ccb05d935fbed1b4deeb