Merge "Set windowInfo.displayId to be the layerStack" into sc-v2-dev am: 3c13a3c798 am: da7ade5b50

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

Change-Id: Id8ca729df783adfa92834cb02a2ac76e5690dbc9