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

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

Change-Id: I82317946368f47b95742808c62f5e9c5a5257eb9