[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: 04ccacac -s ours am: 039e8a7b -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idf938d2a0fad7a72fd9dfce4ee9c6dbaa04452ac