Merge "Improve printing of Display- and Layer- Settings" into tm-dev am: a1349142

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



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