Merge "Switch shell-transit default to screenshots" into tm-qpr-dev am: d6a46c43 am: 37431d31

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



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