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

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

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