Merge "Switch System.currentTimeMillis() to Event.getEventTime()" into tm-qpr-dev am: 88b496958e

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

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