[automerger skipped] Merge "Ensure that expected present time is in the...

[automerger skipped] Merge "Ensure that expected present time is in the future" am: 2ea36520 am: 444ea081 am: 60bda728 -s ours

am skip reason: Change-Id I095f1dd08374fd1d14552cd1af90d95e9718b4dd with SHA-1 819636cd is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1557199

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ac8803db111115625ce19130477c8f5a466ef72