[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: fa785e17 -s ours

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

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



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