Merge "[DO NOT MERGE] Revert "[2/n] Display stack provides DisplayInfos"" into sc-v2-dev am: b0a2e9f742

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

Change-Id: I395ca7f8ce09c7a849fb71b5c3067cabf81d9ead