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

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

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



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