Merge "[layer tracing] generate composition state for non-default displays"...

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

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



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