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: Id18f4abc6d74b0b8c433d51776324f209b7e740b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>