Fix spot not disappear when display id changed am: e34bc53ff6 am: c1994d84a9 am: c93ef13343 am: 49abc8507d

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

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