Merge "Save tasks' windowing modes instead of TDA's" into udc-dev am: 6773f05a am: a2d021d4

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



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