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

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

Change-Id: I20c8db86d587781ac005b595226ccd39fa475b13