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

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

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