[automerger skipped] Set windowInfo.displayId to be the layerStack am: 65c005a6e9 am: 00b040eaca -s ours am: aa17556c0a -s ours am: 05f66b4369 -s ours am: 4b699b18b2 -s ours am: 4ed0517d91 -s ours am: 1405708728 -s ours am: 0a3840806d -s ours am: 7aefbb9f37 -s ours

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

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

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