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

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



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