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

Merge "Improve printing of Display- and Layer- Settings" into tm-dev am: a1349142 am: 88fa9327 am: 3d7b6410 am: 6e98c0cc

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



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