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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7800429fa86079abddf4ed736b79bccfe8f4ee78