Merge "Revert "Fix cts testMinimalSizeDocked fail when device supports...

Merge "Revert "Fix cts testMinimalSizeDocked fail when device supports multiwindow feature."" into main am: f5f46e54

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



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