Merge "Use event time instead of System.currentTimeMillis" into tm-qpr-dev am: 6de8305ba3 am: 432bcab140

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

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