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

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



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