[automerger skipped] Fix spot not disappear when display id changed am: e74b35ff -s ours

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

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



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