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

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



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