Merge "Remove windowing mode override from task when it matches display" into...

Merge "Remove windowing mode override from task when it matches display" into udc-qpr-dev am: 5f433062

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



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