Merge "Use EventLogTags for logging" into main am: a362fe4662 am: b6768d0c61

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

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