Merge "Fix WindowInputTests#testOverlapWindow failing (1/2)" into rvc-dev am: 33a2bc8f

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



Change-Id: Ibcdf0496f6f75fa4608754f4ed64e063d6e9bafe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>