[automerger skipped] [DO NOT MERGE] Revert "[2/n] Display stack provides DisplayInfos" am: 4dfa01a8 am: 98f8b559 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0309bd8ca503f1c0f01614078c1617005cb428c5