Merge "Add displayid to WindowInfos test wrapper" into udc-dev am: 037c6556 am: 37ae0baa

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



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