Merge "Collect tasks when windowing mode of parent display changes" into...

Merge "Collect tasks when windowing mode of parent display changes" into tm-qpr-dev am: cbef171d am: 90cffa4b

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



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