Merge "correct up eventTime" into main am: 64736b3216

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

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