Merge "Remove deprecated call of EventLog" am: f66a13358d am: 7365ed5e56

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

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