[automerger skipped] Merge "Check Task windowing mode when reporting display...

[automerger skipped] Merge "Check Task windowing mode when reporting display features" into tm-dev am: cfe0279f am: 253f3e88 -s ours am: 4f9b4bec -s ours am: 1ead21aa -s ours

am skip reason: Merged-In I00f62574124df6df61f121228bd91ff9bc751c2a with SHA-1 2eae3a52 is already in history

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



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