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

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



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