Merge "RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus" into sc-dev am: 854b04130b am: 8d46bdb823

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

Change-Id: I48bd17f5270423f68cedfeb4ca481edbf6a7d969