Fix spot not disappear when display id changed am: 687e58faa4 am: 14f1db706c

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

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