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

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

Change-Id: I33096e9e6ff87816061349ab846aecde9455d873