Merge "Clean UserEventLogger (1/2)" into udc-qpr-dev am: 354d38ab am: e5dc54b7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/24085365



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