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

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



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