Merge "Improve printing of Display- and Layer- Settings" into tm-dev am: a134914200 am: 88fa9327c0 am: fa9d1f0281

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

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