[automerger skipped] Merge "[DO NOT MERGE] Revert "[2/n] Display stack...

[automerger skipped] Merge "[DO NOT MERGE] Revert "[2/n] Display stack provides DisplayInfos"" into sc-v2-dev am: b0a2e9f7 am: 23ca5b62 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ife4bd15501f97c1ff12bdfc81ae0d97dabac077a