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

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

Change-Id: I69c2c2734526dd1ec4646373b8475f1ba6779f77