Merge "Refine output of "dumpsys window displays/windows"" into sc-dev am: fd38f5d1

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

Change-Id: I10bbec625b8769748c9749f904fa879348f82cbc