Merge "Add grace period to estimated launch times." into tm-dev am: d9bb3495 am: ebff96b1

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



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