Merge "Fix snapshot starting window stuck if the task never gain focus" into...

Merge "Fix snapshot starting window stuck if the task never gain focus" into sc-v2-dev am: e921c7a2

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

Change-Id: Ie90d58fcc2f66dfce98728ac4dfe46be01092938