[automerger skipped] Set windowInfo.displayId to be the layerStack am: 65c005a am: 00b040e -s ours am: aa17556 -s ours

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

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

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

Author: chaviw