Merge "Ensure that expected present time is in the future" am: 2ea3652017

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad6d4231954f01dd7ee39815f7c48c32b19b7b64