Fix spot not disappear when display id changed am: e34bc53f

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



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