Merge "Fix flaky test WindowInputTestsi#testTrustedOverlapWindow" into sc-v2-dev am: 651343388f

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

Change-Id: I4001fabda75da2bfc2da66eb7692cc021078e549