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

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

Change-Id: I51662e7e8a33af42c25a1eb942df3f7d9bb1092f