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

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



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