[automerger skipped] Merge "DO NOT MERGE: Revert "Check display id of the last...

[automerger skipped] Merge "DO NOT MERGE: Revert "Check display id of the last hover window before it is cleared"" into tm-qpr-dev am: ab97d6e3 -s ours am: e6c392d4 -s ours

am skip reason: subject contains skip directive

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



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