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: fa9d1f02 am: 0080b58f

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



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