Merge "Fix WindowManager boot timeout on emulators" into main am: 7ad4eb3b4d am: 7c9990ac07

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

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