[automerger skipped] Merge "RESTRICT AUTOMERGE: Fix snapshot starting window...

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

am skip reason: subject contains skip directive

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

Change-Id: I4d51fc419e8a26d25a0425a2e408e3045bc50d22