Merge "Check display id of the last hover window before it is cleared" am: 78b66d311a

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

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