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