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 am: 98ba093c

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



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