Merge "Check Task windowing mode when reporting display features" into...

Merge "Check Task windowing mode when reporting display features" into tm-qpr-dev am: 44ca54f1 am: 48cddec7

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



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