Fix spot not disappear when display id changed am: 687e58fa am: 14f1db70 am: b474ee49

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



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