[automerger skipped] Merge "Fix spot not disappear when display id changed"...

[automerger skipped] Merge "Fix spot not disappear when display id changed" am: dbbf3d24 -s ours am: c0268aa7 -s ours am: ec1bdce8 -s ours am: e43fc45b -s ours am: 3ca53491 -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: I5667bdd7b35071fa5f2e172c2d68d24f3613eaac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>