[automerger skipped] Merge "Fix WindowInputTests#testOverlapWindow failing...

[automerger skipped] Merge "Fix WindowInputTests#testOverlapWindow failing (1/2)" into rvc-dev am: 33a2bc8f am: 727c672f -s ours am: 5e82ca79 -s ours am: 3e68d6dd -s ours am: a3edb5c6 -s ours

am skip reason: Merged-In Idf17fd64c6a1399d04c51e3f0bd600dc4a84239a with SHA-1 c3decccd is already in history

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



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