[automerger skipped] Merge "Check Task windowing mode when reporting display features" into tm-dev am: cfe0279f69 am: 253f3e886e am: ee1d57c4ae -s ours
am skip reason: Merged-In I00f62574124df6df61f121228bd91ff9bc751c2a with SHA-1 fad7f25eeb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18972307
Change-Id: Ia45594e44db0a5d9e05319adffa45eb0e349d6c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: