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

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

Change-Id: I384fe10f0413ee93e0ec103a300933d8dd14ff61