Merge "Fix race condition causing screenshot view to be added to window twice"...

Merge "Fix race condition causing screenshot view to be added to window twice" into sc-qpr1-dev am: 4c76184e

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

Change-Id: I0b4d1d6e8dd62c83619af8f2096d228e9320ad57