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

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

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



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