Merge "Move task to fullscreen or freeeform on transition" into tm-qpr-dev am:...

Merge "Move task to fullscreen or freeeform on transition" into tm-qpr-dev am: 455c6651 am: 34046b0a

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



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