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

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



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