[automerger skipped] Merge "RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus" into sc-dev am: 854b04130b am: 8d46bdb823 am: 4fb125f713 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7356886cdbc09a333bbc9a2e2759ed55d01dc9e2