[automerger skipped] Set windowInfo.displayId to be the layerStack am:...

[automerger skipped] Set windowInfo.displayId to be the layerStack am: 65c005a6 am: 00b040ea -s ours am: aa17556c -s ours am: 05f66b43 -s ours am: 3c03cdc3 -s ours am: 195c312a -s ours

am skip reason: Merged-In Id1794798a543260c9868ccdc1be3cdb574b73dd5 with SHA-1 6eada62e is already in history

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



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