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

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



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