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

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

Change-Id: I48c0f44dc710388bbaec96c8f42b182da979a1a1