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

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

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