Merge "Revert "Fix win mode issues for unresizable apps"" into tm-qpr-dev am:...

Merge "Revert "Fix win mode issues for unresizable apps"" into tm-qpr-dev am: 4476d919 am: e63a7ca2

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



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