Merge "SF: populate state correctly in Display::applyLayerRequestsToLayers" into sc-dev am: 6383bb0580 am: ceb700410a

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

Change-Id: I9f7e13d9cf1ad8a99080bb0d8ed76bb1b3832830