[automerger skipped] Merge "fix: Refactor User Lifecycle Event and Report...

[automerger skipped] Merge "fix: Refactor User Lifecycle Event and Report metrics logging" into udc-dev am: 03238a8a am: d1789ce4 am: b0fb9f42 -s ours am: 824d0806 -s ours

am skip reason: Merged-In Id2632415b66834fe99fb627f9c9ed35d12ba207d with SHA-1 b76fe237 is already in history

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



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