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

Merge "Revert^2 "Fix cts testMinimalSizeDocked fail when device supports multiwindow feature."" into main am: 22ae8401

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



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