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: Ic2d3aeb49107249151220043f99601b6a964438d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>