Merge "SF: handle presentTime in the past" into udc-dev am: 612b7822dc am: d3971f9392

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

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