Merge "Use the TaskFragment override screenLayout for fix rotation" into tm-qpr-dev am: 1f2487e2

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



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