[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 am: ee1d57c4 -s ours am: a8cd6f6b -s ours

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

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



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