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

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

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