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

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



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