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

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

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