Merge "[layer tracing] generate composition state for non-default displays" into udc-dev am: 63241c3c am: c71a392f

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



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