[automerger skipped] Merge "Check display id of the last hover window before...

[automerger skipped] Merge "Check display id of the last hover window before it is cleared" am: 78b66d31 am: 91609c37 am: 658c7475 -s ours

am skip reason: Merged-In I70ebcb994ebc31327b85303110753ce3d40329be with SHA-1 dae9dfcf is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2273427



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