Merge "Added windowToken to WindowInfo object" into sc-v2-dev am: f334812daa am: a860164936

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

Change-Id: I0604f7ed3011111ae0c18416b06e83b7fca336f3