Merge "Check Task windowing mode when reporting display features" into tm-dev am: cfe0279f

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



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