[automerger skipped] Fix spot not disappear when display id changed am:...

[automerger skipped] Fix spot not disappear when display id changed am: 70e413d0 -s ours am: 0c66d651 -s ours am: 614d7d97 -s ours

am skip reason: Merged-In Ic289d772087e53716b4d63c431d9f41af721150e with SHA-1 e34bc53f is already in history

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



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