Merge "Do not set window crop of task until display is enabled" into main am: 93b8756b96 am: 64edb61468

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3182559

Change-Id: I7ef181e441dded507e16b2b727eeacae0c803067
Signed-off-by: Automerger Merge Worker <[email protected]>