Merge "Waiting a proper time to remove the snapshot starting window" into sc-dev am: 87d84d5e

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

Change-Id: I2b02f5b5f009825058b34e3a23b41db653f7c583