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 am: 749c45ee

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

Change-Id: I1a46bdf3cc9aa3734d1f6346f58544b2af0fe382