Merge "fix: Refactor User Lifecycle Event and Report metrics logging" into udc-dev am: 03238a8a

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



Change-Id: I31044524dee2ad7a75d23941d0f8bcbf182ad8b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>